From 07b3293fd92ee47c1db4d82de36ff3714a1da98e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 09 Oct 2020 18:33:31 +0800
Subject: [PATCH] 1.修改增加运营平台首页查看数据的角色值 2.修改部分角色的数据范围为空时的报错。
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 8a1dd0e..c23fe7a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -326,15 +326,13 @@
Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
List<SysUser> list = baseMapper.findList(page, params);
long total = page.getTotal();
- if (total > 0) {
+ if (total > 0&&list.size()>0) {
List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
-
- List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
-
-// Map<String, Object> map = new HashMap<String, Object>();
-// List<SysOrganization> sysOrganizationList=organizationService.fin();
- list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
- .collect(Collectors.toList())));
+ if (userIds.size()>0) {
+ List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
+ list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
+ .collect(Collectors.toList())));
+ }
}
return PageResult.<SysUser>builder().data(list).code(0).count(total).build();
}
--
Gitblit v1.8.0