diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 14323e85..7c49b615 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -730,8 +730,8 @@ class ProjectController extends AbstractController $task_id = intval(Request::input('task_id')); $name = Request::input('name'); // - $task = ProjectTask::userTask($task_id); - if (!$task->owner && !$task->project_owner) { + $task = ProjectTask::userTask($task_id, [], true, $project); + if (!$task->owner && !$project->owner) { return Base::retError('仅限项目或任务负责人添加'); } // @@ -773,8 +773,8 @@ class ProjectController extends AbstractController parse_str(Request::getContent(), $data); $task_id = intval($data['task_id']); // - $task = ProjectTask::userTask($task_id); - if (!$task->owner && !$task->project_owner) { + $task = ProjectTask::userTask($task_id, [], true, $project); + if (!$task->owner && !$project->owner) { return Base::retError('仅限项目或任务负责人修改'); } // @@ -819,8 +819,8 @@ class ProjectController extends AbstractController // $task_id = Base::getPostInt('task_id'); // - $task = ProjectTask::userTask($task_id); - if (!$task->owner && !$task->project_owner) { + $task = ProjectTask::userTask($task_id, [], true, $project); + if (!$task->owner && !$project->owner) { return Base::retError('仅限项目或任务负责人上传'); } // @@ -918,8 +918,8 @@ class ProjectController extends AbstractController $task_id = intval(Request::input('task_id')); $type = Request::input('type', 'add'); // - $task = ProjectTask::userTask($task_id, [], false); - if (!$task->owner && !$task->project_owner) { + $task = ProjectTask::userTask($task_id, [], false, $project); + if (!$task->owner && !$project->owner) { return Base::retError('仅限项目或任务负责人操作'); } // @@ -946,8 +946,8 @@ class ProjectController extends AbstractController // $task_id = intval(Request::input('task_id')); // - $task = ProjectTask::userTask($task_id); - if (!$task->owner && !$task->project_owner) { + $task = ProjectTask::userTask($task_id, [], true, $project); + if (!$task->owner && !$project->owner) { return Base::retError('仅限项目或任务负责人删除'); } // diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 5d6a0a87..765e206a 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -732,7 +732,7 @@ class ProjectTask extends AbstractModel * @param bool $ignoreArchived 排除已归档 * @return self */ - public static function userTask($task_id, $with = [], $ignoreArchived = true) + public static function userTask($task_id, $with = [], $ignoreArchived = true, &$project = null) { $builder = self::with($with)->whereId(intval($task_id)); if ($ignoreArchived) { @@ -744,7 +744,6 @@ class ProjectTask extends AbstractModel } // $project = Project::userProject($task->project_id, $ignoreArchived); - $task->project_owner = $project->owner; // return $task; }