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());