From 3385f5d6e4da5ba81b684591c9d22e820633239f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= <zhujinyong@cnezsoft.com>
Date: Mon, 17 Apr 2023 08:18:39 +0000
Subject: [PATCH] * Fix multiple task.

---
 db/update18.3.sql     | 4 ++++
 db/zentao.sql         | 4 ++--
 module/task/model.php | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/db/update18.3.sql b/db/update18.3.sql
index bd62288cf7..5df480c953 100644
--- a/db/update18.3.sql
+++ b/db/update18.3.sql
@@ -881,6 +881,10 @@ ALTER TABLE `zt_taskspec`
 CHANGE `estStarted` `estStarted` date NULL,
 CHANGE `deadline` `deadline` date NULL;
 
+ALTER TABLE `zt_taskteam`
+CHANGE `transfer` `transfer` char(30) NOT NULL DEFAULT '',
+CHANGE `order` `order` tinyint NOT NULL DEFAULT '0';
+
 ALTER TABLE `zt_team`
 CHANGE `position` `position` varchar(30) NOT NULL DEFAULT '',
 CHANGE `join` `join` date NULL;
diff --git a/db/zentao.sql b/db/zentao.sql
index 90f7ace6d9..11cc19830d 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1754,9 +1754,9 @@ CREATE TABLE `zt_taskteam` (
   `estimate` decimal(12,2) NOT NULL,
   `consumed` decimal(12,2) NOT NULL,
   `left` decimal(12,2) NOT NULL,
-  `transfer` char(30) NOT NULL,
+  `transfer` char(30) NOT NULL DEFAUT '',
   `status` enum('wait','doing','done') NOT NULL DEFAULT 'wait',
-  `order` tinyint(3) NOT NULL,
+  `order` tinyint(3) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `task` (`task`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/module/task/model.php b/module/task/model.php
index 86de28ea70..8f952f5d6f 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -944,8 +944,8 @@ class taskModel extends model
             $member->order    = $row;
             $member->account  = $account;
             $member->estimate = zget($this->post->teamEstimate, $row, 0);
-            $member->consumed = zget($this->post->teamConsumed, $row, 0);
-            $member->left     = zget($this->post->teamLeft, $row, 0);
+            $member->consumed = $this->post->teamConsumed ? zget($this->post->teamConsumed, $row, 0) : 0;
+            $member->left     = $this->post->teamLeft ? zget($this->post->teamLeft, $row, 0) : 0;
             $member->status   = 'wait';
             if($taskStatus == 'wait' and $member->estimate > 0 and $member->left == 0) $member->left = $member->estimate;
             if($taskStatus == 'done') $member->left = 0;