From 30cdf46fdfe2a848230b6975a8f69a2092e5f4a8 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 6 Nov 2025 08:52:01 +0800 Subject: [PATCH 1/2] * [refac bug #66942] Check operate effort priv. --- module/task/model.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 55fc34ba3e..1fd43263ea 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -758,8 +758,7 @@ class taskModel extends model 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; - return false; + return $this->loadModel('common')->canOperateEffort($effort); } /** From 57adb125f6a1a88f5ca94831a1437a7df24983b1 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 6 Nov 2025 09:08:13 +0800 Subject: [PATCH 2/2] * [refac bug #66942] Adjust unit test. --- module/task/test/model/canoperateeffort.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/task/test/model/canoperateeffort.php b/module/task/test/model/canoperateeffort.php index b39f2fa5ad..4fa7756ec4 100755 --- a/module/task/test/model/canoperateeffort.php +++ b/module/task/test/model/canoperateeffort.php @@ -46,6 +46,9 @@ $task->mode = ''; $task->openedBy = 'dev1'; $task->assignedTo = 'admin'; +global $app; +$app->user->admin = false; + $taskTest = new taskTest(); r($taskTest->canOperateEffort($task)) && p() && e('1'); //判断非多人任务