From 2ed4916f8e424865031da8757967daf0abf11e82 Mon Sep 17 00:00:00 2001
From: Carina <meet.carina@foxmail.com>
Date: Mon, 29 Nov 2021 14:50:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E7=99=BB=E9=99=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9FBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modulars/system/login/web/LoginRestController.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java
index cb8f0c4b..ae316681 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java
@@ -111,8 +111,11 @@ public class LoginRestController {
         // 如果验证成功， 则清除锁定信息
         UserTokenUtil.clearLockAccount(form.getUsername());
 
-        // 如果不是超级管理员
-        if(!StringUtils.equals(UserUtil.SUPER_ADMIN, user.getUsername())){
+        // 如果不是超级管理员 并且不是系统系统用户 则进行验证
+        if(!StringUtils.equals(UserUtil.SUPER_ADMIN, user.getUsername()) &&
+                !TenantUtil.SUPER_ADMIN_TENANT_ID.equals(user.getTenantId())
+            ){
+
             // 账号锁定验证
             if(StringUtils.isEmpty(user.getEnable()) ||
                     DictType.NO_YES_NO.getValue().equals(user.getEnable())){