From da34a320a640808634aeeb48564225411e668e5a Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@easycorp.ltd>
Date: Wed, 29 Nov 2023 15:05:10 +0800
Subject: [PATCH] * Fix sql error in DMDB.

---
 db/zentao.sql        | 22 +++++++++++-----------
 module/bug/model.php |  5 ++++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/db/zentao.sql b/db/zentao.sql
index 7a999e22ec..009666bbc7 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -13245,7 +13245,7 @@ CREATE TABLE IF NOT EXISTS `zt_workflowaction` (
   `name` varchar(50) NOT NULL DEFAULT '',
   `type` enum('single','batch') NOT NULL DEFAULT 'single',
   `batchMode` enum('same','different') NOT NULL DEFAULT 'different',
-  `extensionType` varchar(10) NOT NULL DEFAULT 'override' COMMENT 'none | extend | override',
+  `extensionType` varchar(10) NOT NULL DEFAULT 'override',
   `open` varchar(20) NOT NULL DEFAULT '',
   `position` enum('menu','browseandview','browse','view') NOT NULL DEFAULT 'browseandview',
   `layout` char(20) NOT NULL DEFAULT '',
@@ -13467,13 +13467,13 @@ CREATE INDEX `version` ON `zt_workflowversion` (`version`);
 -- DROP TABLE IF EXISTS `zt_workflowreport`;
 CREATE TABLE IF NOT EXISTS `zt_workflowreport` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `module` varchar(30) NOT NULL COMMENT 'module name',
-  `name` varchar(100) NOT NULL COMMENT 'report name',
-  `type` enum('pie', 'line', 'bar') NOT NULL DEFAULT 'pie' COMMENT 'report type',
-  `countType` enum('sum', 'count') NOT NULL DEFAULT 'sum' COMMENT 'report count method',
-  `displayType` enum('value', 'percent') NOT NULL DEFAULT 'value' COMMENT 'report display method',
-  `dimension` varchar(130) NOT NULL COMMENT 'dimension field code of zt_workflowfield',
-  `fields` text NOT NULL COMMENT 'count fileds code of zt_workflowfield,use comma split',
+  `module` varchar(30) NOT NULL,
+  `name` varchar(100) NOT NULL,
+  `type` enum('pie', 'line', 'bar') NOT NULL DEFAULT 'pie',
+  `countType` enum('sum', 'count') NOT NULL DEFAULT 'sum',
+  `displayType` enum('value', 'percent') NOT NULL DEFAULT 'value',
+  `dimension` varchar(130) NOT NULL,
+  `fields` text NOT NULL,
   `order` smallint(5) unsigned NOT NULL DEFAULT '0',
   `createdBy` varchar(30) NOT NULL DEFAULT '',
   `createdDate` datetime NULL,
@@ -14194,9 +14194,9 @@ CREATE TABLE IF NOT EXISTS `zt_solutions` (
  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
  `execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
- `contents` text NOT NULL COMMENT '问题描述',
- `support` text NOT NULL COMMENT '是否需要高层支持',
- `measures` text NOT NULL COMMENT '解决建议',
+ `contents` text NOT NULL,
+ `support` text NOT NULL,
+ `measures` text NOT NULL,
  `type` char(30) NOT NULL DEFAULT '',
  `addedBy` varchar(30) NOT NULL DEFAULT '',
  `addedDate` date NULL,
diff --git a/module/bug/model.php b/module/bug/model.php
index eb0c59bff5..8a5d48d258 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -3750,7 +3750,10 @@ class bugModel extends model
         $relatedObjectIdList = array();
         $relatedObjects      = array();
 
-        foreach($bugs as $bug) $relatedObjectIdList[$bug->$object]  = $bug->$object;
+        foreach($bugs as $bug)
+        {
+            if(is_numeric($bug->$object)) $relatedObjectIdList[$bug->$object]  = $bug->$object;
+        }
 
         if($object == 'openedBuild' or $object == 'resolvedBuild') $object = 'build';