From 8afa885e52ecd12f8dca4c9750f8631783472aa9 Mon Sep 17 00:00:00 2001 From: liuhong Date: Wed, 24 Aug 2022 00:44:54 +0000 Subject: [PATCH 1/2] *Fix bug #66233. --- module/task/model.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 6717cb0f90..66b5f2cb4f 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1258,7 +1258,7 @@ class taskModel extends model $task->{$extendField->field} = htmlSpecialString($task->{$extendField->field}); } - if(isset($data->consumeds[$taskID])) + if(isset($data->consumeds[$taskID]) and !empty($data->consumeds[$taskID])) { if($data->consumeds[$taskID] < 0) { @@ -3947,9 +3947,9 @@ class taskModel extends model { $this->updateExecutionEsDateByGantt($objectID, $objectType, $post); } - + if(dao::isError()) return false; - + $newObject = $this->dao->select('*')->from($changeTable)->where('id')->eq($objectID)->fetch(); $changes = common::createChanges($oldObject, $newObject); $actionID = $this->loadModel('action')->create($actionType, $objectID, 'edited'); From 4e574b0a67debb4c078291c99b97b63b1d839457 Mon Sep 17 00:00:00 2001 From: liuhong Date: Wed, 24 Aug 2022 00:57:41 +0000 Subject: [PATCH 2/2] *Fix bug #66233. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 66b5f2cb4f..dbd50cfa3f 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1258,7 +1258,7 @@ class taskModel extends model $task->{$extendField->field} = htmlSpecialString($task->{$extendField->field}); } - if(isset($data->consumeds[$taskID]) and !empty($data->consumeds[$taskID])) + if(!empty($data->consumeds[$taskID])) { if($data->consumeds[$taskID] < 0) {