From 293d5042a773595ded45bdc9c69c4555ab9c5dd5 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 14 May 2020 18:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 94f1dad..2bdf1cd 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
@@ -21,7 +21,6 @@
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.validator.constraints.NotBlank;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -209,6 +208,9 @@
             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())));
         }
@@ -313,7 +315,7 @@
                     List<SysUserOrg> sysUserOrgs = iSysUserOrgService.list(queryWrapper);
                     List<Long> userIds = sysUserOrgs.stream().map(e -> e.getUserId()).collect(Collectors.toList());
                     QueryWrapper<SysUser> sysUserQueryWrapper=new QueryWrapper();
-                    sysUserQueryWrapper.in("id",userIds);
+                    sysUserQueryWrapper.in("id",userIds.stream().distinct().collect(Collectors.toList()));
                     sysUsers= baseMapper.selectList(sysUserQueryWrapper);
                 }
             }
@@ -322,4 +324,10 @@
         }
         return ResultBody.ok().data(sysUsers);
     }
+
+    @Override
+    public ResultBody findCountByMap(Map<String, Object> map) {
+        Integer integer = baseMapper.selectCountByMap(map);
+        return ResultBody.ok().data(integer);
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0