diff --git a/module/task/control.php b/module/task/control.php index 5c4e124a1f..aef0fc98c3 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -811,6 +811,7 @@ class task extends control } /** + * 取消一个任务。 * Cancel a task. * * @param int $taskID @@ -830,7 +831,7 @@ class task extends control { $this->loadModel('action'); - $oldTask = $this->task->getById($taskID); + $oldTask = $this->task->getByID($taskID); $task = $this->taskZen->buildTaskForCancel($oldTask); $laneID = isset($output['laneID']) ? $output['laneID'] : ''; $this->task->cancel($task, (string)$laneID); diff --git a/module/task/model.php b/module/task/model.php index a6f691179b..43d9dcbe3d 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1173,17 +1173,17 @@ class taskModel extends model } /** + * 取消一个任务。 * Cancel a task. * - * @param object $task - * @param string $extra - * + * @param object $task + * @param string $extra * @access public - * @return array + * @return bool */ public function cancel(object $task, string $extra = ''): bool { - $oldTask = $this->getById($task->id); + $oldTask = $this->getByID($task->id); $this->dao->update(TABLE_TASK)->data($task) ->autoCheck() ->checkFlow()