From f5f444c2bbb1e1e90a6ea6d0fbbfa06c07deed2d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 04 Nov 2020 16:47:24 +0800
Subject: [PATCH] 修改h端添加用户不能登录的问题

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 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 996495c..1fbec45 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());
@@ -852,6 +854,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 +866,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