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); } /** 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'); //判断非多人任务