diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 668b22d68..3286b50d1 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -911,7 +911,7 @@ class ProjectController extends AbstractController $sorts = is_array($sorts) ? $sorts : []; // 任务可见性 - $visibility_task_ids = ProjectTask::getVisibleUserids($userid, $project_id); + $visibility_task_ids = ProjectTask::getVisibleUserids($userid, $project_id); $builder = ProjectTask::with(['taskUser', 'taskTag']); $builder->whereIn("project_tasks.id", $visibility_task_ids); @@ -1367,7 +1367,7 @@ class ProjectController extends AbstractController $data = $task->toArray(); $data['project_name'] = $task->project?->name; $data['column_name'] = $task->projectColumn?->name; - $data['visibility_appointor'] = $task->is_all_visible==1 ? [0] : ProjectTaskUser::whereTaskId($task_id)->whereOwner(2)->pluck('userid'); + $data['visibility_appointor'] = $task->is_all_visible == 1 ? [0] : ProjectTaskUser::whereTaskId($task_id)->whereOwner(2)->pluck('userid'); return Base::retSuccess('success', $data); } @@ -1673,7 +1673,7 @@ class ProjectController extends AbstractController $data = ProjectTask::oneTask($task->id); $projectUserid = Project::whereId($data->project_id)->value('userid'); $pushUserIds = ProjectTaskUser::whereTaskId($task->id)->pluck('userid')->toArray(); - $pushUserIds[] = $projectUserid; + $pushUserIds[] = $projectUserid; foreach ($pushUserIds as $userId) { $task->pushMsg('add', $data, $userId); } @@ -1730,14 +1730,14 @@ class ProjectController extends AbstractController $data['visibility_appointor'] = $data['is_all_visible'] == 1 ? [] : ProjectTaskUser::whereTaskId($task->id)->whereOwner(2)->pluck('userid'); $task->pushMsg('update', $data); // 可见性推送 - if($task->parent_id == 0){ + if ($task->parent_id == 0) { $subUserids = ProjectTaskUser::whereTaskPid($data['id'])->pluck('userid')->toArray(); if (Arr::exists($param, 'is_all_visible') || Arr::exists($param, 'visibility_appointor')) { if ($data['is_all_visible'] == 1) { $task->pushMsgVisibleAdd($data); } if ($param['visibility_appointor']) { - $oldVisibleUserIds = $taskUser->where('owner', 2)->pluck('userid')->toArray()??[]; + $oldVisibleUserIds = $taskUser->where('owner', 2)->pluck('userid')->toArray() ?? []; $newVisibleUserIds = $param['visibility_appointor'] ?? []; $deleteUserIds = array_diff($oldVisibleUserIds, $newVisibleUserIds, $subUserids); $addUserIds = array_diff($newVisibleUserIds, $oldVisibleUserIds); @@ -1759,15 +1759,15 @@ class ProjectController extends AbstractController $task->pushMsgVisibleRemove($diff); } } - }else{ - if(Arr::exists($param, 'owner') ){ - $diff = array_diff($owners, $param['owner'] ?: [] ); + } else { + if (Arr::exists($param, 'owner')) { + $diff = array_diff($owners, $param['owner'] ?: []); if ($diff) { $task->pushMsgVisibleRemove($diff); } $parentTask = ProjectTask::whereId($task->parent_id)->first(); $subUserids = ProjectTaskUser::whereTaskPid($task->parent_id)->pluck('userid')->toArray(); - if ( $parentTask && $parentTask->is_all_visible != 1 && empty($subUserids) ) { + if ($parentTask && $parentTask->is_all_visible != 1 && empty($subUserids)) { $diff = array_diff($owners, $param['owner'] ?: [], $subUserids); if ($diff) { $parentTask->pushMsgVisibleRemove($diff); diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 9b9d77235..3500c70f3 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -465,7 +465,7 @@ class ProjectTask extends AbstractModel } } // - return AbstractModel::transaction(function() use ($assist, $times, $subtasks, $content, $owner, $task, $visibility_userids) { + return AbstractModel::transaction(function () use ($assist, $times, $subtasks, $content, $owner, $task, $visibility_userids) { $task->save(); $owner = array_values(array_unique($owner)); foreach ($owner as $uid) { @@ -676,11 +676,11 @@ class ProjectTask extends AbstractModel foreach ($owner as $uid) { if (intval($uid) == 0) continue; if (!$this->project->useridInTheProject($uid)) continue; - $row = ProjectTaskUser::where("task_id",$this->id) - ->where("userid",$uid) - ->where("owner",'!=', 2) + $row = ProjectTaskUser::where("task_id", $this->id) + ->where("userid", $uid) + ->where("owner", '!=', 2) ->first(); - if(empty($row)){ + if (empty($row)) { ProjectTaskUser::createInstance([ 'task_id' => $this->id, 'userid' => $uid, @@ -688,7 +688,7 @@ class ProjectTask extends AbstractModel 'task_pid' => $this->parent_id ?: $this->id, 'owner' => 1, ])->save(); - }else{ + } else { $row->project_id = $this->project_id; $row->task_pid = $this->parent_id ?: $this->id; $row->owner = 1; @@ -716,13 +716,13 @@ class ProjectTask extends AbstractModel } // 可见性 if (Arr::exists($data, 'is_all_visible') || Arr::exists($data, 'visibility_appointor')) { - if(Arr::exists($data, 'is_all_visible')){ + if (Arr::exists($data, 'is_all_visible')) { ProjectTask::whereId($data['task_id'])->update(['is_all_visible' => $data["is_all_visible"]]); } ProjectTaskUser::whereTaskId($data['task_id'])->whereOwner(2)->delete(); - if(Arr::exists($data, 'visibility_appointor')){ + if (Arr::exists($data, 'visibility_appointor')) { foreach ($data['visibility_appointor'] as $uid) { - if($uid){ + if ($uid) { ProjectTaskUser::createInstance([ 'project_id' => $this->project_id, 'task_id' => $this->id, @@ -1410,12 +1410,11 @@ class ProjectTask extends AbstractModel $data = $data->toArray(); } // - $userids = []; if ($userid === null) { $userids = $this->project->relationUserids(); } else { $userids = is_array($userid) ? $userid : [$userid]; - } + } // $array = []; if (empty($data['parent_id'])) { @@ -1482,7 +1481,7 @@ class ProjectTask extends AbstractModel /** * 添加可见性任务 推送 - * @param array|self $data 发送内容，默认为[id, parent_id, project_id, column_id, dialog_id] + * @param array|self $data 发送内容，默认为[id, parent_id, project_id, column_id, dialog_id] */ public function pushMsgVisibleAdd($data = null, array $pushUserIds = []) { @@ -1504,8 +1503,8 @@ class ProjectTask extends AbstractModel $array = []; if ($pushUserIds) { $userids = $pushUserIds; - }elseif ($this->is_all_visible != 1) { - $userids = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($this->id)->orWhere('task_pid' , '=', $this->id)->pluck('userid')->toArray(); + } elseif ($this->is_all_visible != 1) { + $userids = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($this->id)->orWhere('task_pid', '=', $this->id)->pluck('userid')->toArray(); } else { $userids = ProjectUser::whereProjectId($this->project_id)->pluck('userid')->toArray(); // 项目成员 } @@ -1555,7 +1554,7 @@ class ProjectTask extends AbstractModel $projectOwner = Project::whereId($this->project_id)->pluck('userid')->toArray(); // 项目负责人 $taskOwnerAndAssists = ProjectTaskUser::select(['userid', 'owner'])->whereIn('owner', [0, 1])->whereTaskId($this->id)->pluck('userid')->toArray(); $subUserids = ProjectTaskUser::whereTaskPid($this->id)->pluck('userid')->toArray(); - $userids = array_diff($projectUserids, $projectOwner, $taskOwnerAndAssists,$subUserids); + $userids = array_diff($projectUserids, $projectOwner, $taskOwnerAndAssists, $subUserids); } // $array[] = [ @@ -1580,7 +1579,7 @@ class ProjectTask extends AbstractModel /** * 更新可见性任务 推送 - * @param array|self $data 发送内容，默认为[id, parent_id, project_id, column_id, dialog_id] + * @param array|self $data 发送内容，默认为[id, parent_id, project_id, column_id, dialog_id] */ public function pushMsgVisibleUpdate($data, array $deleteUserIds = [], array $addUserIds = []) { @@ -1736,7 +1735,7 @@ class ProjectTask extends AbstractModel ->when($project_id, function ($q) use ($project_id) { $q->where('pt.project_id', '=', $project_id); // 负责人项目ids }) - ->where(function ($q) use ($userid){ + ->where(function ($q) use ($userid) { $q->where("pt.is_all_visible", '=', 1); $q->OrWhere("p.userid", '=', $userid); $q->OrWhere("b.userid", '=', $userid); diff --git a/resources/assets/js/components/UserSelect.vue b/resources/assets/js/components/UserSelect.vue index 993bd7373..5cca8dc92 100755 --- a/resources/assets/js/components/UserSelect.vue +++ b/resources/assets/js/components/UserSelect.vue @@ -1,7 +1,7 @@