Merge pull request dataease#3749 from dataease/pr@dev@perf_user_grid

xuwei-fit2cloud · web-flow · commit f86d0c729ce3 · 2022-11-15T13:01:35.000+08:00
perf: 查询用户列表过滤废弃角色
diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -74,7 +74,7 @@ public List<SysUserGridResponse> query(KeyGridRequest request) {
         List<SysUserGridResponse> lists = extSysUserMapper.query(gridExample);
         lists.forEach(item -> {
             List<SysUserRole> roles = item.getRoles();
-            List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+            List<Long> roleIds = roles.stream().filter(ObjectUtils::isNotEmpty).map(SysUserRole::getRoleId).collect(Collectors.toList());
             item.setRoleIds(roleIds);
         });
         return lists;
