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 | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 fb96ff6..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
@@ -272,7 +272,7 @@
String oldTel = MapUtils.getString(params, "oldTel");
String newTel = AesUtils.desEncrypt(MapUtils.getString(params, "newTel")).trim();
String authCode = AesUtils.desEncrypt(MapUtils.getString(params, "authCode")).trim();
- String userPassword = AesUtils.desEncrypt(MapUtils.getString(params, "userPassword")).trim();
+ String userPassword =MapUtils.getString(params, "userPassword");
if (id > 0 && StringUtils.isNotBlank(oldTel) && StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) {
//检查验证码
@@ -298,8 +298,8 @@
com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel = new com.kidgrow.usercenter.model.SysDoctor();
if (sysDoctorModel != null) {
//理论上只有一个，如果有多个 只取第一个
- newsysDoctorModel.setId(sysDoctorModel.getId());
- newsysDoctorModel.setDoctorTel(newTel);
+ sysDoctorModel.setId(sysDoctorModel.getId());
+ sysDoctorModel.setDoctorTel(newTel);
sysDoctorMapper.updateById(newsysDoctorModel);
}
if (baseMapper.updateById(user) > 0) {
@@ -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);
@@ -963,6 +965,9 @@
} else {
listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
}
+ listVoList.sort((e1,e2)->
+ e2.getUserId().compareTo(e1.getUserId())
+ );
return ResultBody.ok().data(listVoList);
} else {
return ResultBody.failed("医院数据有误");
--
Gitblit v1.8.0