From 4f170236c33a9b4d8fa08f426729068588ff5587 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Mon, 5 Sep 2022 13:33:38 +0800
Subject: [PATCH]  * fix bug #27262.

---
 module/task/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 81426c7236..d51add30fc 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -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;