github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 优化任务可见性推送逻辑

Browse Source
This commit is contained in:
kuaifan 2025-09-29 09:04:31 +08:00
parent 81c019105c
commit 0666a8f5c2
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1991,7 +1991,9 @@ class ProjectController extends AbstractController
'path' => $file->getRawOriginal('path'), 'path' => $file->getRawOriginal('path'),
'thumb' => $file->getRawOriginal('thumb'), 'thumb' => $file->getRawOriginal('thumb'),
]); ]);
$task->pushMsg('filedelete', $file); $task->pushMsg('filedelete', [
'id' => $file->id,
]);
$file->delete(); $file->delete();
// //
return Base::retSuccess('success', $file); return Base::retSuccess('success', $file);

31
app/Models/ProjectTask.php
View File

@ -1579,7 +1579,8 @@ class ProjectTask extends AbstractModel
} elseif ($data instanceof self) { } elseif ($data instanceof self) {
$data = $data->toArray(); $data = $data->toArray();
} }
//
// 获取接收会员
if ($userid === null) { if ($userid === null) {
$userids = $this->project->relationUserids(); $userids = $this->project->relationUserids();
} else { } else {
@ -1590,11 +1591,7 @@ class ProjectTask extends AbstractModel
return; return;
} }
if (!Arr::exists($data, 'visibility')) { // 按可见性分组推送
$data['visibility'] = $this->visibility;
}
$visibility = intval($data['visibility']);
$taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->get(); $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->get();
$ownerList = $taskUser->where('owner', 1)->pluck('userid')->toArray(); $ownerList = $taskUser->where('owner', 1)->pluck('userid')->toArray();
$assistList = $taskUser->where('owner', 0)->pluck('userid')->toArray(); $assistList = $taskUser->where('owner', 0)->pluck('userid')->toArray();
@ -1603,16 +1600,19 @@ class ProjectTask extends AbstractModel
$assistUsers = array_values(array_diff(array_intersect($userids, $assistList), $ownerUsers)); $assistUsers = array_values(array_diff(array_intersect($userids, $assistList), $ownerUsers));
$array = []; $array = [];
// 负责人
if ($ownerUsers) { if ($ownerUsers) {
$array[] = [ $array[] = [
'userid' => $ownerUsers, 'userid' => $ownerUsers,
'data' => array_merge($data, [ 'data' => array_merge($data, [
'owner' => 1, 'owner' => 1,
'assist' => 1, 'assist' => 0,
]) ])
]; ];
} }
// 协助人
if ($assistUsers) { if ($assistUsers) {
$array[] = [ $array[] = [
'userid' => $assistUsers, 'userid' => $assistUsers,
@ -1623,27 +1623,31 @@ class ProjectTask extends AbstractModel
]; ];
} }
// 其他人
$otherUsers = []; $otherUsers = [];
switch ($visibility) { switch (intval($data['visibility'])) {
case 1: case 1:
// 项目人员：除了负责人、协助人项目其他人
$otherUsers = array_diff($userids, $ownerUsers, $assistUsers); $otherUsers = array_diff($userids, $ownerUsers, $assistUsers);
break; break;
case 2: case 2:
$otherUsers = []; // 任务人员：除了负责人、协助人
// $otherUsers = [];
break; break;
case 3: case 3:
// 指定成员
$specifys = ProjectTaskVisibilityUser::select(['userid'])->whereTaskId($data['id'])->pluck('userid')->toArray(); $specifys = ProjectTaskVisibilityUser::select(['userid'])->whereTaskId($data['id'])->pluck('userid')->toArray();
$otherUsers = array_diff(array_intersect($userids, $specifys), $ownerUsers, $assistUsers); $otherUsers = array_diff(array_intersect($userids, $specifys), $ownerUsers, $assistUsers);
break; break;
default:
$otherUsers = array_diff($userids, $ownerUsers, $assistUsers);
break;
} }
if ($otherUsers) { if ($otherUsers) {
$array[] = [ $array[] = [
'userid' => array_values($otherUsers), 'userid' => array_values($otherUsers),
'data' => $data 'data' => array_merge($data, [
'owner' => 0,
'assist' => 0,
])
]; ];
} }
@ -1651,6 +1655,7 @@ class ProjectTask extends AbstractModel
return; return;
} }
// 推送
foreach ($array as $item) { foreach ($array as $item) {
$params = [ $params = [
'ignoreFd' => $ignoreSelf ? Request::header('fd') : null, 'ignoreFd' => $ignoreSelf ? Request::header('fd') : null,

8
resources/assets/js/store/actions.js vendored
View File

@ -4609,11 +4609,6 @@ export default {
case 'recovery': // 恢复（归档） case 'recovery': // 恢复（归档）
dispatch("saveTask", data) dispatch("saveTask", data)
break; break;
case 'relation':
if (data?.id) {
emitter.emit('taskRelationUpdate', data.id)
}
break;
case 'dialog': case 'dialog':
dispatch("saveTask", data) dispatch("saveTask", data)
dispatch("getDialogOne", data.dialog_id).catch(() => {}) dispatch("getDialogOne", data.dialog_id).catch(() => {})
@ -4627,6 +4622,9 @@ export default {
case 'delete': case 'delete':
dispatch("forgetTask", data) dispatch("forgetTask", data)
break; break;
case 'relation':
emitter.emit('taskRelationUpdate', data.id)
break;
} }
})(msgDetail); })(msgDetail);
break; break;