dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:4e5cdfb216eea092f7a09ba00a084c820b42716f
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
..
compare: dianliang:03f68df90187c7393232e359072410155722f1c9
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

No commits in common. "4e5cdfb216eea092f7a09ba00a084c820b42716f" and "03f68df90187c7393232e359072410155722f1c9" have entirely different histories.
4e5cdfb216 ... 03f68df901

1 changed files with 5 additions and 10 deletions
Show Stats Expand all files Collapse all files

15
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
View File

@ -105,16 +105,11 @@ public class AuthController {
} }
List<RoleReqDTO> roleList = roleApi.getRoleList(); List<RoleReqDTO> roleList = roleApi.getRoleList();
List<String> roleNames = roleList.stream().filter(item -> roleIdsByUserId.contains(item.getId())).map(item -> item.getName()).collect(Collectors.toList()); List<String> roleNames = roleList.stream().filter(item -> roleIdsByUserId.contains(item.getId())).map(item -> item.getName()).collect(Collectors.toList());
if (roleList.isEmpty()){ // Boolean flag = (loginBody.getType().equals("0") && roleNames.contains("救援业务管理员")) || (loginBody.getType().equals("1") && roleNames.contains("交警"));
return error(new ErrorCode(2_002_000_005, "登录失败，当前登录用户未分配任何角色")); // 角色认证登录
} // if (!flag) {
if (loginBody.getTypes().equals("3") && !roleNames.contains("教练")){ // return error(new ErrorCode(2_002_000_005, "登录账号不存在"));
return error(new ErrorCode(2_002_000_005, "当前登录用户未分配教练角色")); // }
}
if (loginBody.getTypes().equals("2") && !roleNames.contains("驾校管理员")){
return error(new ErrorCode(2_002_000_005, "当前登录用户未分配驾校管理员角色"));
}
AuthLoginReqVO authLoginReqVO = new AuthLoginReqVO(); AuthLoginReqVO authLoginReqVO = new AuthLoginReqVO();
authLoginReqVO.setUsername(loginBody.getUsername()); authLoginReqVO.setUsername(loginBody.getUsername());
authLoginReqVO.setPassword(loginBody.getPassword()); authLoginReqVO.setPassword(loginBody.getPassword());