Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan
2021-06-24 11:21:22 +08:00
parent d626647156
commit a9b2b041ce
4 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,9 +236,11 @@ class ProjectController extends AbstractController
$array[] = $uid;
}
}
$delete = ProjectUser::whereProjectId($project->id)->whereNotIn('userid', $array);
$deleteUser = $delete->pluck('userid');
$delete->delete();
$deleteRows = ProjectUser::whereProjectId($project->id)->whereNotIn('userid', $array)->get();
$deleteUser = $deleteRows->pluck('userid');
foreach ($deleteRows as $row) {
$row->exitProject();
}
$project->syncDialogUser();
$project->addLog("修改项目成员");
return $deleteUser->toArray();
@@ -358,7 +360,8 @@ class ProjectController extends AbstractController
}
//
AbstractModel::transaction(function() use ($user, $project) {
ProjectUser::whereProjectId($project->id)->whereUserid($user->userid)->delete();
$row = ProjectUser::whereProjectId($project->id)->whereUserid($user->userid)->first();
$row && $row->exitProject();
$project->syncDialogUser();
$project->addLog("会员ID：" . $user->userid . " 退出项目");
$project->pushMsg('delete', null, $user->userid);