Pārlūkot izejas kodu

fix: selectUserList

shc 9 mēneši atpakaļ
vecāks
revīzija
16e8769286

+ 9 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1216,8 +1216,15 @@ public class SysUserController {
                 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());