From 2ab506dd2e96f2cd6f6430e9c7c3e231f0f1484a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 26 Feb 2026 11:40:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(auth):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除账号锁定检查后的重复大括号
- 添加用户是否已登录的状态检查
- 保留会话中用户信息的设置逻辑
- 维持token生成和数据库保存功能
---
 .../sys/controller/SysLoginController.java      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java b/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java
index c0beb2a..f3199bf 100644
--- a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java
+++ b/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java
@@ -105,15 +105,16 @@ public class SysLoginController extends AbstractController {
 				return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200207));
 			}
 
-			//账号锁定
-			if(user.getStatus() == 0){
-				return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208));
-			}
+		//账号锁定
+		if(user.getStatus() == 0){
+			return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208));
 		}
-		/*if(sysUserTokenService.isUserLoggedIn(user.getUserId())){
-			return R.error("用户已经登录，请先退出后再登录");
-		}*/
-		session.setAttribute("user", user);
+	}
+	// 检查用户是否已登录 - rqrq
+	if(sysUserTokenService.isUserLoggedIn(user.getUserId())){
+		return R.error("用户已经登录，请先退出后再登录");
+	}
+	session.setAttribute("user", user);
 
 		//生成token，并保存到数据库
 		R r = sysUserTokenService.createToken(user.getUserId());