From 0c0e1e9adcc0102b2ed0d88f1fec94e83f4174e6 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Thu, 23 Jul 2020 09:24:01 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 4de2178..1ffc091 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 @@ -807,12 +807,16 @@ sysUserOrgH.setUserId(sysUser.getId()); sysUserOrgH.setOrgId(organizationHos); + sysUserOrgH.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL); + sysUserOrgH.setFromId(userRegVo.getHospitalId()); sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId()); sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername()); sysUserOrgList.add(sysUserOrgH); sysUserOrgD.setUserId(sysUser.getId()); sysUserOrgD.setOrgId(organizationDep); + sysUserOrgD.setFromId(userRegVo.getDepartmentId()); + sysUserOrgD.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL); sysUserOrgD.setCreateUserId(isReg ? createUserId : sysUserd.getId()); sysUserOrgD.setCreateUserName(isReg ? createUserName : sysUserd.getUsername()); sysUserOrgList.add(sysUserOrgD); @@ -826,7 +830,7 @@ sysDoctor.setDepartmentName(userRegVo.getDepartmentName()); sysDoctor.setDoctorRank(userRegVo.getDoctorRank()); sysDoctor.setDoctorRankId(userRegVo.getDoctorRankId()); - sysDoctor.setDoctorType(1); + sysDoctor.setDoctorType(CommonConstant.H_DOCTOR_TYPE); sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId()); sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername()); if (isReg) { -- Gitblit v1.8.0