* fix bug #27262.

2022-09-05 13:33:56 +08:00
parent 2f3e8d91ae
commit 4f170236c3
1 changed files with 2 additions and 2 deletions
@@ -816,7 +816,7 @@ class taskModel extends model
            {
                if(!$autoStatus) return $currentTask;

-                if($currentTask->consumed == 0)
+                if($currentTask->consumed == 0 and empty($efforts))
                {
                    if(!isset($task->status)) $currentTask->status = 'wait';
                    $currentTask->finishedBy   = '';
@@ -2966,7 +2966,7 @@ class taskModel extends model
        $data->consumed = $consumed;
        $data->left     = $left;
        $data->status   = ($left == 0 && $consumed != 0) ? 'done' : $task->status;
-        if($consumed == 0 and $task->status != 'wait')
+        if($estimate->isLast and $consumed == 0 and $task->status != 'wait')
        {
            $data->status = 'wait';
            $data->left   = $task->estimate;