forked from kidgrow-microservices-platform
blame | history | patch | commit | commitdiff | ignore whitespace
侯瑞军
2020-05-14 293d5042a773595ded45bdc9c69c4555ab9c5dd5 
 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);


    }


}