From 4a50ba57371abc2728a7af296a8c3ddae5533ade Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 25 Aug 2022 16:14:22 +0800
Subject: [PATCH]  * fix for finish task.

---
 module/task/model.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 9066e65058..c42409119f 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1964,16 +1964,7 @@ class taskModel extends model
 
         if(!empty($oldTask->team) and $currentTeam)
         {
-            $this->dao->update(TABLE_TASKTEAM)
-                ->set('left')->eq(0)
-                ->set('consumed')->eq($task->consumed)
-                ->set('status')->eq('done')
-                ->where('task')->eq((int)$taskID)
-                ->andWhere('account')->eq($this->app->user->account)->exec();
-
-            $skipMembers = $oldTask->mode == 'linear' ? $this->loadModel('execution')->getTeamSkip($oldTask->team, $oldTask->assignedTo, $task->assignedTo) : $this->getFinishedUsers($oldTask->id, array_keys($oldTask->team));
-            foreach($skipMembers as $account => $team) $this->dao->update(TABLE_TASKTEAM)->set('left')->eq(0)->where('task')->eq($taskID)->andWhere('account')->eq($account)->exec();
-
+            $this->dao->update(TABLE_TASKTEAM)->set('left')->eq(0)->set('consumed')->eq($task->consumed)->set('status')->eq('done')->where('id')->eq($currentTeam->id)->exec();
             $task = $this->computeHours4Multiple($oldTask, $task);
 
             $finishedUsers = $this->getFinishedUsers($oldTask->id, array_keys($oldTask->members));