From a0cd79e5870d86263245bf4023512ea5f2bdd5f2 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 24 Mar 2025 21:33:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=8B=89?= =?UTF-8?q?=E4=BA=BA=E8=BF=9B=E7=BE=A4=E6=97=A0=E6=B3=95=E8=B8=A2=E5=87=BA?= =?UTF-8?q?=E5=8E=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/Project.php | 1 + app/Models/ProjectTask.php | 1 + app/Models/WebSocketDialog.php | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Models/Project.php b/app/Models/Project.php index ad2e78c18..52ae60aa2 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -221,6 +221,7 @@ class Project extends AbstractModel 'important' => 1 ], function () use ($userid) { return [ + 'important' => 1, 'bot' => User::isBot($userid) ? 1 : 0, ]; }); diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 3a34b95b3..7c38f5caa 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -1201,6 +1201,7 @@ class ProjectTask extends AbstractModel 'important' => 1 ], function () use ($userid) { return [ + 'important' => 1, 'bot' => User::isBot($userid) ? 1 : 0, ]; }); diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index 7a6f2e807..cc61fd9cc 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -447,10 +447,10 @@ class WebSocketDialog extends AbstractModel WebSocketDialogUser::updateInsert([ 'dialog_id' => $this->id, 'userid' => $value, - ], $updateData, function() use ($value) { - return [ - 'bot' => User::isBot($value) ? 1 : 0, - ]; + ], $updateData, function() use ($value, $updateData) { + return array_merge($updateData, [ + 'bot' => User::isBot($value) ? 1 : 0 + ]); }, $isInsert); if ($isInsert) { WebSocketDialogMsg::sendMsg(null, $this->id, 'notice', [