From 81065b8fa819ee2653ee23a3574868784a9be412 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Fri, 26 Feb 2021 16:10:34 +0800
Subject: [PATCH] 运营平台添加医生或H端添加医生密码为默认的

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 996495c..744856f 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
@@ -704,6 +704,7 @@
                 sysOrganizationH.setCreateUserId(createUserId);
                 sysOrganizationH.setCreateUserName(createUserName);
                 if (organizationService.save(sysOrganizationH)) {
+                    organizationHos=sysOrganizationH.getId();
                     //写科室组织数据
                     SysOrganization sysOrganizationD = new SysOrganization();
                     sysOrganizationD.setOrgLevel(2);
@@ -713,6 +714,7 @@
                     sysOrganizationD.setCreateUserId(createUserId);
                     sysOrganizationD.setCreateUserName(createUserName);
                     if (organizationService.save(sysOrganizationD)) {
+                        organizationDep=sysOrganizationD.getId();
                         //写医院组织数据
                         SysHospital sysHospital = new SysHospital();
                         sysHospital.setHospitalName(userRegVo.getHospitalName());
@@ -796,7 +798,11 @@
             sysUser.setType(UserType.DOCTOR.name());
         }
         sysUser.setHAdminUser(false);
-        sysUser.setDefaultAuth(false);
+        if(isReg){
+            sysUser.setDefaultAuth(false);
+        }else{
+            sysUser.setDefaultAuth(true);
+        }
         sysUser.setOpenId(userRegVo.getOpenId());
         sysUser.setDel(false);
         sysUser.setTenantId(CommonConstant.H_TENANT);
@@ -852,6 +858,10 @@
 
                         if (dicBool) {
                             //写用户组织关系表
+                            SysHospital byId = hospitalService.getById(userRegVo.getHospitalId());
+                            if(byId!=null){
+                                organizationHos=byId.getOrgId();
+                            }
                             List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>();
                             sysUserOrgH.setUserId(sysUser.getId());
                             sysUserOrgH.setOrgId(organizationHos);
@@ -860,7 +870,10 @@
                             sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId());
                             sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
                             sysUserOrgList.add(sysUserOrgH);
-
+                            SysDepartment department = departmentService.getById(userRegVo.getDepartmentId());
+                            if(department!=null){
+                                organizationDep=department.getOrgId();
+                            }
                             sysUserOrgD.setUserId(sysUser.getId());
                             sysUserOrgD.setOrgId(organizationDep);
                             sysUserOrgD.setFromId(userRegVo.getDepartmentId());

--
Gitblit v1.8.0