From ccf07ecb2f6f79a3ba23032be2c931b323f3feef Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Sat, 22 Aug 2020 21:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=B3=A8=E9=94=80=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/common/model/Users.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hyhproject/common/model/Users.php b/hyhproject/common/model/Users.php
index dc01756..f1701d3 100755
--- a/hyhproject/common/model/Users.php
+++ b/hyhproject/common/model/Users.php
@@ -168,8 +168,11 @@ class Users extends Base{
                     ->where(["dataFlag"=>1])
                     ->find();
         if(isset($rs['userStatus']) && 0 == $rs['userStatus']){//禁用状态
-            $lockInfo = Db::name('user_lock')->where(['userId'=>$rs['userId']])->field('lockReason,lockTime,createTime')->order('id DESC')->find();
+            $lockInfo = Db::name('user_lock')->where(['userId'=>$rs['userId']])->field('adminId,lockReason,lockTime,createTime')->order('id DESC')->find();
             if($lockInfo){
+                if(0 == $lockInfo['adminId']){
+                    return WSTReturn($lockInfo['lockReason']);
+                }
                 if(0 == $lockInfo['lockTime']){
                     return WSTReturn("账号已禁用,禁用原因：".$lockInfo['lockReason'].',禁用时间：永久');
                 }