Merge branch 'fixbug_21140' into 'master'

*Fixbug_21140 See merge request easycorp/zentaopms!3107
2022-04-25 06:42:26 +00:00
parent 35ae55a75b 1cf2e5e541
commit 37733991df
2 changed files with 4 additions and 4 deletions
@@ -1641,7 +1641,7 @@ class taskModel extends model
        $data->lastEditedDate = $now;
        if(helper::isZeroDate($task->realStarted)) $data->realStarted = $now;

-        if($left == 0)
+        if($left == 0 and strpos('done,cancel,closed', $task->status) === false)
        {
            $data->status       = 'done';
            $data->assignedTo   = $task->openedBy;
@@ -1656,7 +1656,7 @@ class taskModel extends model
            $data->assignedDate = $now;
            $data->realStarted  = $earliestTime;
        }
-        elseif($task->status == 'pause')
+        elseif($left != 0 and strpos('done,cancel,closed,pause', $task->status) !== false)
        {
            $data->status       = 'doing';
            $data->assignedTo   = $this->app->user->account;