From 3bacfe8b8ff75533e54fb03b4d12b8541a859ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 27 Jul 2026 11:46:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(auth):=20=E6=B3=A8=E9=87=8A=E9=9D=9E?=
 =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉单租户登录时对非超级管理员账号的限制判断
- 避免非超级管理员登录时返回错误拦截
- 保持其他登录及账号状态判断逻辑不变
- 允许更多用户类型能正常登录系统
---
 .../system/controller/MainController.java     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index a26531e..aa01919 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -990,11 +990,11 @@ public class MainController extends BaseController {
     // 单租户：直接登录（现有逻辑不变，单租户用户无感知）
     if (superAdmins.size() == 1) {
       User user = superAdmins.get(0);
-      if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) {
-        String message = "非超级管理员账号不允许登录";
-        loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
-        return fail(message, null);
-      }
+//      if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) {
+//        String message = "非超级管理员账号不允许登录";
+//        loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
+//        return fail(message, null);
+//      }
       if (!user.getStatus().equals(0)) {
         String message = "账号被冻结";
         loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
@@ -1057,11 +1057,11 @@ public class MainController extends BaseController {
       loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, param.getTenantId(), request);
       return fail(message, null);
     }
-    if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) {
-      String message = "非超级管理员账号不允许登录";
-      loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
-      return fail(message, null);
-    }
+//    if (!Boolean.TRUE.equals(user.getIsSuperAdmin())) {
+//      String message = "非超级管理员账号不允许登录";
+//      loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, user.getTenantId(), request);
+//      return fail(message, null);
+//    }
 
     String access_token = generateToken(user);
     loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);