From e62f6a4b254223bc367b9d32e5ee637b5aefef72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= <zhujinyong@cnezsoft.com>
Date: Tue, 18 Apr 2023 08:23:00 +0000
Subject: [PATCH] * Fix install for dmdb.

---
 db/update18.3.sql |  7 +++++++
 db/zentao.sql     | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/db/update18.3.sql b/db/update18.3.sql
index b982b579f3..683eacac4e 100644
--- a/db/update18.3.sql
+++ b/db/update18.3.sql
@@ -1034,9 +1034,16 @@ CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
 CHANGE `editedDate` `editedDate` datetime NULL;
 
 ALTER TABLE `zt_workflowlabel`
+CHANGE `orderBy` `orderBy` text NULL;
 CHANGE `editedBy` `editedBy` char(30) NOT NULL DEFAULT '',
 CHANGE `editedDate` `editedDate` datetime NULL;
 
+ALTER TABLE `zt_workflowlayout`
+CHANGE `position` `position` text NULL,
+CHANGE `summary` `summary` varchar(20) NOT NULL DEFAULT '',
+CHANGE `defaultValue` `defaultValue` text NULL,
+CHANGE `layoutRules` `layoutRules` varchar(255) NOT NULL DEFAULT '';
+
 ALTER TABLE `zt_workflowrule`
 CHANGE `editedBy` `editedBy` char(30) NOT NULL DEFAULT '',
 CHANGE `editedDate` `editedDate` datetime NULL;
diff --git a/db/zentao.sql b/db/zentao.sql
index 8b6fe74c0d..aa60142d7e 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -12289,12 +12289,12 @@ CREATE TABLE IF NOT EXISTS `zt_workflowlayout` (
   `field` varchar(50) NOT NULL,
   `order` smallint(5) unsigned NOT NULL,
   `width` smallint(5) NOT NULL,
-  `position` text NOT NULL,
+  `position` text NULL,
   `readonly` enum('0','1') NOT NULL DEFAULT '0',
   `mobileShow` enum('0','1') NOT NULL DEFAULT '1',
-  `summary` varchar(20) NOT NULL,
-  `defaultValue` text NOT NULL,
-  `layoutRules` varchar(255) NOT NULL,
+  `summary` varchar(20) NOT NULL DEFAULT '',
+  `defaultValue` text NULL,
+  `layoutRules` varchar(255) NOT NULL DEFAULT '',
   `vision` varchar(10) NOT NULL DEFAULT 'rnd',
   PRIMARY KEY (`id`),
   KEY `module` (`module`),
@@ -12311,7 +12311,7 @@ CREATE TABLE IF NOT EXISTS `zt_workflowlabel` (
   `code` varchar(30) NOT NULL,
   `label` varchar(255) NOT NULL,
   `params` text NOT NULL,
-  `orderBy` text NOT NULL,
+  `orderBy` text NULL,
   `order` tinyint(3) NOT NULL,
   `buildin` tinyint(1) unsigned NOT NULL,
   `role` varchar(10) NOT NULL DEFAULT 'custom',