diff --git a/app/Http/Home/Controllers/UserConsoleController.php b/app/Http/Home/Controllers/UserConsoleController.php index c3d11190..d90c92be 100644 --- a/app/Http/Home/Controllers/UserConsoleController.php +++ b/app/Http/Home/Controllers/UserConsoleController.php @@ -263,11 +263,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 鉴于微信消息模板4.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();