From dffa813b0a6ab6dd02d771e63b8c48b2a4d1af36 Mon Sep 17 00:00:00 2001
From: koogua <xiaochong0302@gmail.com>
Date: Wed, 3 Mar 2021 19:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Home/Controllers/UserConsoleController.php | 6 +-----
 app/Services/Logic/Notice/AccountLogin.php          | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/Http/Home/Controllers/UserConsoleController.php b/app/Http/Home/Controllers/UserConsoleController.php
index 8fc7486a..7f576868 100644
--- a/app/Http/Home/Controllers/UserConsoleController.php
+++ b/app/Http/Home/Controllers/UserConsoleController.php
@@ -259,11 +259,7 @@ class UserConsoleController extends Controller
 
         $subscribe = $subscribeRepo->findByUserId($this->authUser->id);
 
-        $subscribed = 0;
-
-        if ($subscribe) {
-            $subscribed = $subscribe->deleted == 0 ? 1 : 0;
-        }
+        $subscribed = $subscribe ? 1 : 0;
 
         $this->view->pick('user/console/subscribe');
         $this->view->setVar('subscribed', $subscribed);
diff --git a/app/Services/Logic/Notice/AccountLogin.php b/app/Services/Logic/Notice/AccountLogin.php
index e17d3121..687a4205 100644
--- a/app/Services/Logic/Notice/AccountLogin.php
+++ b/app/Services/Logic/Notice/AccountLogin.php
@@ -16,9 +16,6 @@ class AccountLogin extends LogicService
 
     public function handleTask(TaskModel $task)
     {
-        /**
-         * @todo 鉴于微信消息模板４.30下线，暂时下线登录通知
-         */
         $wechatOA = $this->getSettings('wechat.oa');
 
         if ($wechatOA['enabled'] == 0) return;
@@ -31,7 +28,7 @@ class AccountLogin extends LogicService
 
         $subscribe = $subscribeRepo->findByUserId($userId);
 
-        if ($subscribe && $subscribe->deleted == 0) {
+        if ($subscribe) {
 
             $notice = new WeChatAccountLoginNotice();