|
|
@@ -77,8 +77,14 @@ public class CustomUserAuthenticationConverter implements UserAuthenticationConv
|
|
|
principal = jwtUser;
|
|
|
authorities = jwtUser.getAuthorities();
|
|
|
} else {
|
|
|
- user.setRoleList(userMapper.getRoleList(user.getUserId()));
|
|
|
- List<Integer> roleIdList = user.getRoleList().stream()
|
|
|
+ List<MiddleRoleVO> roleList = new ArrayList<>();
|
|
|
+ if(1==user.getSuperAdmin()){
|
|
|
+ roleList = userMapper.getRoleList(user.getUserId());
|
|
|
+ }else{
|
|
|
+ roleList = userMapper.getSuperAdmin();
|
|
|
+ }
|
|
|
+ user.setRoleList(roleList);
|
|
|
+ List<Integer> roleIdList = roleList.stream()
|
|
|
.map(MiddleRoleVO::getRoleId).collect(Collectors.toList());
|
|
|
user.setPermissionList(user.getSuperAdmin() == 1?
|
|
|
permissionMapper.queryAll(new MiddlePermissionParam())
|