Merge remote-tracking branch 'origin/master'

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -74,19 +74,21 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
       @Override
     protected void findAfter(UserEntity entity, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException {
-        Map<Long, String> roleMap = roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getName()));
-        List<Long> userIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList());
-        RoleUserQuery roleUserQuery = new RoleUserQuery();
-        roleUserQuery.setUserIdList(userIdList);
-        Map<Long, List<RoleUserEntity>> collect = roleUserService.find(roleUserQuery).stream().collect(Collectors.groupingBy(item -> item.getUserId()));
-        list.stream().forEach(item->{
-            if(!ObjectUtils.isEmpty(collect.get(item.getId()))){
-                item.setRoleId(collect.get(item.getId()).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(",")));
-                item.setRoleName(collect.get(item.getId()).stream().map(m->roleMap.get(m.getRoleId())).filter(f->f!=null).collect(Collectors.joining(",")));
-            }
-        });
-        super.findAfter(entity, pageInfo, context, list);
-    }
+          if (CollectionUtils.isNotEmpty(list)) {
+              Map<Long, String> roleMap = roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getName()));
+              List<Long> userIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList());
+              RoleUserQuery roleUserQuery = new RoleUserQuery();
+              roleUserQuery.setUserIdList(userIdList);
+              Map<Long, List<RoleUserEntity>> collect = roleUserService.find(roleUserQuery).stream().collect(Collectors.groupingBy(item -> item.getUserId()));
+              list.stream().forEach(item -> {
+                  if (!ObjectUtils.isEmpty(collect.get(item.getId()))) {
+                      item.setRoleId(collect.get(item.getId()).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(",")));
+                      item.setRoleName(collect.get(item.getId()).stream().map(m -> roleMap.get(m.getRoleId())).filter(f -> f != null).collect(Collectors.joining(",")));
+                  }
+              });
+              super.findAfter(entity, pageInfo, context, list);
+          }
+      }
 
     private void doHandlerUser(UserEntity entity) throws AppException {
         if (StringUtils.isNotEmpty(entity.getLoginPwd())) {