From 51a935f694ff92e8befa49513e41c145d3c72209 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Sat, 20 Dec 2025 11:11:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E7=99=BB=E5=BD=95]=20=E9=94=81=E5=B1=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E5=85=81=E8=AE=B8=E5=90=8C=E6=97=B61?=
 =?UTF-8?q?=E4=B8=AA=E5=9C=B0=E6=96=B9=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/auth/service/SysLoginService.java     | 23 +++++++++++-----------
 .../hxhq/system/controller/SysUserController.java  |  9 +++++++++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java
index 1c5239e..114bcd2 100644
--- a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java
+++ b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java
@@ -89,6 +89,18 @@ public class SysLoginService
         LoginUser userInfo = userResult.getData();
         SysUser user = userResult.getData().getSysUser();
 
+        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
+        {
+            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+        }
+        if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+        {
+            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+        }
+        passwordService.validate(user, password);
+
         if (!soloLogin)
         {
             // 如果用户不允许多终端同时登录，清除缓存信息
@@ -105,17 +117,6 @@ public class SysLoginService
             }
         }
 
-        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
-        {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
-        }
-        if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
-        {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
-        }
-        passwordService.validate(user, password);
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
         recordLoginInfo(user.getUserId());
         return userInfo;
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java
index cd01ac2..a8812a9 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java
@@ -77,6 +77,15 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
+    @GetMapping("/checkStatus")
+    public AjaxResult checkStatus()
+    {
+        return AjaxResult.success();
+    }
+
+    /**
+     * 获取用户列表
+     */
     @RequiresPermissions("system:user:list")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)