From 8ca6b532244811471c27a5d6f9385aea5594b85b Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 7 Jul 2022 17:39:16 +0800 Subject: [PATCH] no message --- app/Models/WebSocketDialog.php | 14 ++++++++++---- ...44546_generate_web_socket_dialogs_all_group.php | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index f175466c8..aca7c14ba 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -290,10 +290,16 @@ class WebSocketDialog extends AbstractModel if (!isset($this->appendattrs['groupName'])) { $name = $this->name; if ($this->type == "group") { - if ($this->group_type === 'project') { - $name = \DB::table('projects')->where('dialog_id', $this->id)->value('name'); - } elseif ($this->group_type === 'task') { - $name = \DB::table('project_tasks')->where('dialog_id', $this->id)->value('name'); + switch ($this->group_type) { + case 'project': + $name = \DB::table('projects')->where('dialog_id', $this->id)->value('name'); + break; + case 'task': + $name = \DB::table('project_tasks')->where('dialog_id', $this->id)->value('name'); + break; + case 'all': + $name = Base::Lang('全体成员'); + break; } } $this->appendattrs['groupName'] = $name; diff --git a/database/migrations/2022_07_04_144546_generate_web_socket_dialogs_all_group.php b/database/migrations/2022_07_04_144546_generate_web_socket_dialogs_all_group.php index 9393ff8d0..5b011b171 100644 --- a/database/migrations/2022_07_04_144546_generate_web_socket_dialogs_all_group.php +++ b/database/migrations/2022_07_04_144546_generate_web_socket_dialogs_all_group.php @@ -15,7 +15,7 @@ class GenerateWebSocketDialogsAllGroup extends Migration { if (!WebSocketDialog::whereGroupType('all')->exists()) { $userids = User::whereNull('disable_at')->pluck('userid')->toArray(); - WebSocketDialog::createGroup(null, $userids, 'all'); + WebSocketDialog::createGroup("全体成员 All members", $userids, 'all'); } }