From c8cf2b93d1af092700e0b847c80dca9a2cfa6d92 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Fri, 09 Oct 2020 18:35:48 +0800 Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master --- 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