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

perf:完善临时帐号权限

Browse Source
This commit is contained in:
kuaifan
2023-02-19 23:48:27 +08:00
parent 5f0b858baf
commit d3a50e7810
11 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/ProjectTask.php
View File

@@ -1448,8 +1448,8 @@ class ProjectTask extends AbstractModel
return;
}
$owners = $this->taskUser->pluck('owner', 'userid')->toArray();
$users = User::whereIn('userid', $userids)->whereNull('disable_at')->get();
if (empty($users)) {
$receivers = User::whereIn('userid', $userids)->whereNull('disable_at')->get();
if (empty($receivers)) {
return;
}
@@ -1467,18 +1467,18 @@ class ProjectTask extends AbstractModel
};
/** @var User $user */
foreach ($users as $user) {
foreach ($receivers as $receiver) {
$data = [
'type' => $type,
'userid' => $user->userid,
'userid' => $receiver->userid,
'task_id' => $this->id,
];
if (in_array($type, [1, 2]) && ProjectTaskPushLog::where($data)->exists()) {
continue;
}
//
$replace = $owners[$user->userid] ? "您负责的任务" : "您协助的任务";
$dialog = WebSocketDialog::checkUserDialog($botUser->userid, $data['userid']);
$replace = $owners[$receiver->userid] ? "您负责的任务" : "您协助的任务";
$dialog = WebSocketDialog::checkUserDialog($botUser, $receiver->userid);
if ($dialog) {
ProjectTaskPushLog::createInstance($data)->save();
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', [