From b0c67e15e356c71f77818182b1cbdff26c4b0d2b Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Mon, 21 Aug 2023 11:08:42 +0800
Subject: [PATCH] * Fix the error if the object does not exist.

---
 module/task/control.php |  2 +-
 module/task/model.php   | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 2952f03ab8..22c71b948c 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -537,7 +537,7 @@ class task extends control
         }
 
         $changes = $this->task->deleteWorkhour($effortID);
-        if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+        if(dao::isError() || empty($changes)) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
         $actionID = $this->loadModel('action')->create('task', $taskID, 'DeleteEstimate');
         $this->action->logHistory($actionID, $changes);
diff --git a/module/task/model.php b/module/task/model.php
index b46703ea94..a932050976 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1789,13 +1789,19 @@ class taskModel extends model
      *
      * @param  int    $effortID
      * @access public
-     * @return void
+     * @return array|false
      */
     public function deleteWorkhour(int $effortID)
     {
         $effort = $this->getEffortByID($effortID);
-        $task   = $this->getById($effort->objectID);
-        $now    = helper::now();
+        if(empty($effort))
+        {
+            dao::$errors[] = $this->lang->notFound;
+            return false;
+        }
+
+        $task = $this->getById($effort->objectID);
+        $now  = helper::now();
 
         /* Compute the left and consumed workhour of the task. */
         $consumed = $task->consumed - $effort->consumed;