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) {