clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改系统登录时，权限验证的判断顺序调整

This commit is contained in:
Chuanjian Lai 2021-02-23 14:43:19 +08:00
parent 32a8f7effb
commit 6bc73bf4b7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
View File

@ -16,7 +16,7 @@ import com.ruoyi.system.api.model.LoginUser;
/** /**
* 登录校验方法 * 登录校验方法
* *
* @author ruoyi * @author ruoyi
*/ */
@Component @Component
@ -56,16 +56,17 @@ public class SysLoginService
// 查询用户信息 // 查询用户信息
R<LoginUser> userResult = remoteUserService.getUserInfo(username); R<LoginUser> userResult = remoteUserService.getUserInfo(username);
if (R.FAIL == userResult.getCode())
{
throw new BaseException(userResult.getMsg());
}
if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
{ {
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在"); remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
throw new BaseException("登录用户：" + username + " 不存在"); throw new BaseException("登录用户：" + username + " 不存在");
} }
if (R.FAIL == userResult.getCode())
{
throw new BaseException(userResult.getMsg());
}
LoginUser userInfo = userResult.getData(); LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser(); SysUser user = userResult.getData().getSysUser();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
@ -92,4 +93,4 @@ public class SysLoginService
{ {
remoteLogService.saveLogininfor(loginName, Constants.LOGOUT, "退出成功"); remoteLogService.saveLogininfor(loginName, Constants.LOGOUT, "退出成功");
} }
} }