From 7a92adf94936cfb7360d29bdbeb8f8495fbd22e0 Mon Sep 17 00:00:00 2001
From: "elf@home" <360197197@qq.com>
Date: Sat, 30 May 2020 15:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E9=94=81?=
 =?UTF-8?q?=E5=AE=9Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/UserService.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Base/Service/UserService.class.php b/Application/Base/Service/UserService.class.php
index 1cf972f0..74c4c1a4 100644
--- a/Application/Base/Service/UserService.class.php
+++ b/Application/Base/Service/UserService.class.php
@@ -98,7 +98,7 @@ class UserService
         $user = M('user', 'tab_')->where(['account' => $account])->find();
 
         /* 获取用户数据 */
-        if (empty($user) || $user['lock_status'] != 1  && $user['check_status'] != 1) {
+        if (empty($user) || $user['lock_status'] != 1  || $user['check_status'] != 1) {
             return ['status' => false, 'message' => '账号或密码错误'];
         }
         if ($this->password($password, UC_AUTH_KEY) !== $user['password']) {