فهرست منبع

fix: roleList null

shc 9 ماه پیش
والد
کامیت
e61292c312

+ 3 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1185,7 +1185,6 @@ public class SysUserController {
         Page<?> userVosPage = userService.pageUser(query, SecurityUtils.getUser());
 
 
-
         if (CollUtil.isNotEmpty(userVosPage.getRecords())) {
 
             List<UserVO> collect1 = userVosPage.getRecords().stream().map(o -> (UserVO) o).collect(Collectors.toList());
@@ -1218,7 +1217,7 @@ public class SysUserController {
 
                 //  角色
                 List<SysRole> roles = vo.getRoleList().stream().map(r -> roleId2RoleMap.get(r.getRoleId())).collect(Collectors.toList());
-                vo.setRoleList(roles);
+                vo.setRoleList(CollUtil.isNotEmpty(roles) ? roles : Collections.emptyList());
             });
 
             Page<UserVO> page = new Page<>(userVosPage.getCurrent(), userVosPage.getSize(), userVosPage.getTotal());
@@ -1488,12 +1487,12 @@ public class SysUserController {
 
     @SysLog("给监察员绑定产品")
     @PostMapping(value = "/prod/bind")
-    public R<Boolean> bindDrug(@Validated @RequestBody SysUserDTO.OnProdBind resource){
+    public R<Boolean> bindDrug(@Validated @RequestBody SysUserDTO.OnProdBind resource) {
         return R.ok(userManager.bindDrug(resource, SecurityUtils.getUser()));
     }
 
     @GetMapping(value = "/list/bind/prod")
-    public R<List<String>> listBondProds(@RequestParam(value = "userId") Integer userId){
+    public R<List<String>> listBondProds(@RequestParam(value = "userId") Integer userId) {
         return R.ok(userManager.listBondProds(userId));
     }