|
@@ -1216,8 +1216,15 @@ public class SysUserController {
|
|
vo.setAreaCodes(areaCodes);
|
|
vo.setAreaCodes(areaCodes);
|
|
|
|
|
|
// 角色
|
|
// 角色
|
|
- List<SysRole> roles = vo.getRoleList().stream().map(r -> roleId2RoleMap.get(r.getRoleId())).collect(Collectors.toList());
|
|
|
|
- vo.setRoleList(CollUtil.isNotEmpty(roles) ? roles : Collections.emptyList());
|
|
|
|
|
|
+ List<SysRole> roles = new LinkedList<>();
|
|
|
|
+ for (SysRole r : vo.getRoleList()){
|
|
|
|
+ SysRole role1 = roleId2RoleMap.get(r.getRoleId());
|
|
|
|
+ if (role1 == null){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ roles.add(role1);
|
|
|
|
+ }
|
|
|
|
+ vo.setRoleList(roles);
|
|
});
|
|
});
|
|
|
|
|
|
Page<UserVO> page = new Page<>(userVosPage.getCurrent(), userVosPage.getSize(), userVosPage.getTotal());
|
|
Page<UserVO> page = new Page<>(userVosPage.getCurrent(), userVosPage.getSize(), userVosPage.getTotal());
|