gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2021-06-24 14:55:22 +08:00
parent 10e2ef2689
commit 8847d1d10a
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Api/ProjectController.php
View File

@ -730,8 +730,8 @@ class ProjectController extends AbstractController
$task_id = intval(Request::input('task_id')); $task_id = intval(Request::input('task_id'));
$name = Request::input('name'); $name = Request::input('name');
// //
$task = ProjectTask::userTask($task_id); $task = ProjectTask::userTask($task_id, [], true, $project);
if (!$task->owner && !$task->project_owner) { if (!$task->owner && !$project->owner) {
return Base::retError('仅限项目或任务负责人添加'); return Base::retError('仅限项目或任务负责人添加');
} }
// //
@ -773,8 +773,8 @@ class ProjectController extends AbstractController
parse_str(Request::getContent(), $data); parse_str(Request::getContent(), $data);
$task_id = intval($data['task_id']); $task_id = intval($data['task_id']);
// //
$task = ProjectTask::userTask($task_id); $task = ProjectTask::userTask($task_id, [], true, $project);
if (!$task->owner && !$task->project_owner) { if (!$task->owner && !$project->owner) {
return Base::retError('仅限项目或任务负责人修改'); return Base::retError('仅限项目或任务负责人修改');
} }
// //
@ -819,8 +819,8 @@ class ProjectController extends AbstractController
// //
$task_id = Base::getPostInt('task_id'); $task_id = Base::getPostInt('task_id');
// //
$task = ProjectTask::userTask($task_id); $task = ProjectTask::userTask($task_id, [], true, $project);
if (!$task->owner && !$task->project_owner) { if (!$task->owner && !$project->owner) {
return Base::retError('仅限项目或任务负责人上传'); return Base::retError('仅限项目或任务负责人上传');
} }
// //
@ -918,8 +918,8 @@ class ProjectController extends AbstractController
$task_id = intval(Request::input('task_id')); $task_id = intval(Request::input('task_id'));
$type = Request::input('type', 'add'); $type = Request::input('type', 'add');
// //
$task = ProjectTask::userTask($task_id, [], false); $task = ProjectTask::userTask($task_id, [], false, $project);
if (!$task->owner && !$task->project_owner) { if (!$task->owner && !$project->owner) {
return Base::retError('仅限项目或任务负责人操作'); return Base::retError('仅限项目或任务负责人操作');
} }
// //
@ -946,8 +946,8 @@ class ProjectController extends AbstractController
// //
$task_id = intval(Request::input('task_id')); $task_id = intval(Request::input('task_id'));
// //
$task = ProjectTask::userTask($task_id); $task = ProjectTask::userTask($task_id, [], true, $project);
if (!$task->owner && !$task->project_owner) { if (!$task->owner && !$project->owner) {
return Base::retError('仅限项目或任务负责人删除'); return Base::retError('仅限项目或任务负责人删除');
} }
// //

3
app/Models/ProjectTask.php
View File

@ -732,7 +732,7 @@ class ProjectTask extends AbstractModel
* @param bool $ignoreArchived 排除已归档 * @param bool $ignoreArchived 排除已归档
* @return self * @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)); $builder = self::with($with)->whereId(intval($task_id));
if ($ignoreArchived) { if ($ignoreArchived) {
@ -744,7 +744,6 @@ class ProjectTask extends AbstractModel
} }
// //
$project = Project::userProject($task->project_id, $ignoreArchived); $project = Project::userProject($task->project_id, $ignoreArchived);
$task->project_owner = $project->owner;
// //
return $task; return $task;
} }