From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index aace777..cccda45 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -106,18 +106,24 @@
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
throw new ServiceException("对不起，您的账号：" + username + " 已停用");
}
- if (user.getUserType().equals("02")){
- throw new ServiceException("登录失败，登录账号权限不足");
- }
- if (user.getUserType().equals("03")){
+// if (user.getUserType().equals("02")){
+// throw new ServiceException("登录失败，登录账号权限不足");
+// }
+
+ if (org.springframework.util.StringUtils.hasLength(seBei) && user.getUserType().equals("03")){
SeBei se=new SeBei();
se.setUserId(user.getUserId());
se.setSebei(seBei);
Integer getequipmente = managementClient.getequipmente(se).getData();
if (getequipmente==1){
throw new ServiceException("登录失败，登录账号与当前设备不匹配");
+ }else if (getequipmente==9){
+ throw new ServiceException("登录失败，设备号不存在");
}
}
+ if (org.springframework.util.StringUtils.hasLength(seBei)){
+ userInfo.setIsBig(true);
+ }
passwordService.validate(user, password);
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
return userInfo;
--
Gitblit v1.7.1