Merge branch release/21.7.7 of zentao/zentaopms (#12197)

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);
     }
 
     /**

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