From c061fcca373e2b98cc9f11776edeff9be4aad85c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 28 Jun 2020 10:43:21 +0800
Subject: [PATCH] 修改 医生模板不能删除的bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 454522a..b30238f 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
@@ -639,6 +639,9 @@
@Transactional(rollbackFor = Exception.class)
@Override
public ResultBody doctorUserReg(UserRegVo userRegVo, SysUser sysUserd) {
+ if(sysUserd.getId()==null){
+ sysUserd = this.baseMapper.selectById(userRegVo.getUserId());
+ }
//检查手机号是否已经注册 H端登录名和手机号存一样的值
if (phoneIsUsed(userRegVo.getMobile())) {
return ResultBody.failed("该手机号已经注册");
@@ -722,11 +725,9 @@
if (StringUtils.isBlank(userRegVo.getPassword())) {
defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
- sysUser.setDefaultAuth(false);
userRegVo.setPassword(defaultPassWord);
} else {
sysUser.setPassword(passwordEncoder.encode(userRegVo.getPassword()));
- sysUser.setDefaultAuth(false);
}
sysUser.setNickname(userRegVo.getNickname());
sysUser.setSex(userRegVo.getSex());
@@ -737,6 +738,7 @@
sysUser.setType(UserType.DOCTOR.name());
}
sysUser.setHAdminUser(false);
+ sysUser.setDefaultAuth(false);
sysUser.setOpenId(userRegVo.getOpenId());
sysUser.setDel(false);
sysUser.setTenantId("hospital");
@@ -811,7 +813,13 @@
sysDoctor.setDoctorRankId(userRegVo.getDoctorRankId());
sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId());
sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
- sysDoctor.setDoctorState(userRegVo.getDoctorState());
+ if (isReg) {
+ sysDoctor.setDoctorState(false);
+ }
+ else
+ {
+ sysDoctor.setDoctorState(true);
+ }
sysDoctor.setDoctorTel(userRegVo.getMobile());
sysDoctor.setDoctorName(userRegVo.getNickname());
sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
@@ -945,10 +953,10 @@
return 0;
} else {
Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("departmentId", depatmentId);
+ selectMap.put("department_id", depatmentId);
selectMap.put("enabled", 1);
List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
- if (sysDoctorList == null) {
+ if (sysDoctorList != null) {
int doctorCount = sysDoctorList.size();
int accountCount = sysDepartment.getAccountsCount();
return (accountCount - doctorCount);
--
Gitblit v1.8.0