From 88aee1e3bf8180350e8081a96042955ef1f6519d Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 22 Nov 2024 16:50:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E8=A2=AB=E7=A6=81=E7=94=A8=E4=B9=8B=E5=90=8E=E8=BF=98=E8=83=BD?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E6=8E=A8=E9=80=81=E5=92=8C=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Tasks/EmailNoticeTask.php        | 2 +-
 app/Tasks/WebSocketDialogMsgTask.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Tasks/EmailNoticeTask.php b/app/Tasks/EmailNoticeTask.php
index c409db084..1a8f91156 100644
--- a/app/Tasks/EmailNoticeTask.php
+++ b/app/Tasks/EmailNoticeTask.php
@@ -124,7 +124,7 @@ class EmailNoticeTask extends AbstractTask
     private function sendUserEmail(int $userId, string $dialogType, Carbon $startTime, Carbon $endTime): void
     {
         // 验证用户
-        $user = User::find($userId);
+        $user = User::whereDisableAt(null)->find($userId);
         if (!$user || $user->bot || !is_null($user->disable_at) || !Base::isEmail($user->email)) {
             return;
         }
diff --git a/app/Tasks/WebSocketDialogMsgTask.php b/app/Tasks/WebSocketDialogMsgTask.php
index 910a360f9..257b5cbd2 100644
--- a/app/Tasks/WebSocketDialogMsgTask.php
+++ b/app/Tasks/WebSocketDialogMsgTask.php
@@ -191,6 +191,7 @@ class WebSocketDialogMsgTask extends AbstractTask
                 }
                 $langs = User::select(['userid', 'lang'])
                     ->whereIn('userid', $umengUserid)
+                    ->whereDisableAt(null)
                     ->get()
                     ->groupBy('lang')
                     ->map(function($group) {