From acd7193e55ef2bab41e1e46443f917737c5a7c5e Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 30 Oct 2022 15:48:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=AE=89=E8=A3=85=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BC=9A=E8=AF=9D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...22_07_04_144546_generate_web_socket_dialogs_all_group.php | 2 +- database/seeders/WebSocketDialogsTableSeeder.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 5b011b171..e2112c42a 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 @@ -13,7 +13,7 @@ class GenerateWebSocketDialogsAllGroup extends Migration */ public function up() { - if (!WebSocketDialog::whereGroupType('all')->exists()) { + if (WebSocketDialog::count() > 0 && !WebSocketDialog::whereGroupType('all')->exists()) { $userids = User::whereNull('disable_at')->pluck('userid')->toArray(); WebSocketDialog::createGroup("全体成员 All members", $userids, 'all'); } diff --git a/database/seeders/WebSocketDialogsTableSeeder.php b/database/seeders/WebSocketDialogsTableSeeder.php index 365b844da..014da93a1 100644 --- a/database/seeders/WebSocketDialogsTableSeeder.php +++ b/database/seeders/WebSocketDialogsTableSeeder.php @@ -2,6 +2,8 @@ namespace Database\Seeders; +use App\Models\User; +use App\Models\WebSocketDialog; use Illuminate\Database\Seeder; class WebSocketDialogsTableSeeder extends Seeder @@ -221,6 +223,7 @@ class WebSocketDialogsTableSeeder extends Seeder ), )); - + $userids = User::whereNull('disable_at')->pluck('userid')->toArray(); + WebSocketDialog::createGroup("全体成员 All members", $userids, 'all'); } }