From 24679b74b46479acf248151f70a3768a9588249b Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Thu, 15 Oct 2020 16:58:55 +0800 Subject: [PATCH] 修改 h端添加的用户不能在h端登录的问题 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 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 9b95c0b..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(); } @@ -835,7 +833,11 @@ //创建字典数据 sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK); //将名称汉字转为拼音 - sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true))); + String keyStr=Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)); + if (keyStr.length()>50) { + keyStr=keyStr.substring(0,49); + } + sysDictionaries.setDictionariesKey(keyStr); sysDictionaries.setDictionariesName(userRegVo.getDoctorRank()); sysDictionaries.setCreateUserId(createUserId); sysDictionaries.setCreateUserName(createUserName); -- Gitblit v1.8.0