From a02a2ed2908fdec6f7427e7ca76f2f74c65c085b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 1 Jun 2023 11:36:15 +0800 Subject: [PATCH] * Modify the logic of the linear task check operate effort. --- module/task/model.php | 2 +- module/task/test/model/canoperateeffort.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 5d3f656b99..74249c2727 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1810,7 +1810,7 @@ class taskModel extends model /* Check for edit and delete effort. */ if($task->mode == 'linear') { - if(!in_array($task->status, $this->config->task->unfinishedStatus)) return false; + if(in_array($task->status, array('pause', 'cancel', 'closed'))) return false; if($task->status == 'doing') return $effort->account == $this->app->user->account; } if($this->app->user->account == $effort->account) return true; diff --git a/module/task/test/model/canoperateeffort.php b/module/task/test/model/canoperateeffort.php index b947149c70..3215681a9b 100755 --- a/module/task/test/model/canoperateeffort.php +++ b/module/task/test/model/canoperateeffort.php @@ -65,7 +65,7 @@ r($taskTest->canOperateEffort($task)) && p() && e('1'); //判断当前用户在 $effort = new stdclass(); $effort->account = 'admin'; -$task->mode = 'multi'; +$task->mode = 'linear'; $task->status = 'done'; r($taskTest->canOperateEffort($task, $effort)) && p() && e('1'); //判断已完成多人任务并且日志创建者和当前用户一致