From 3ecb43bd5455df7c541d382370c981c4ffa24853 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 16:13:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index 909202c..ce57544 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -190,17 +190,16 @@
                     return ResultBody.failed("选择一个角色");
                 }
             }
-
-            /**
-             * 限制只有创建医生的个数
-             *
-             */
-            if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
-                return ResultBody.failed("该部门创建人数已经达到上限");
-            }
             SysHospital sysHospital = sysHospitalMapper.selectById(sysDoctor.getHospitalId());
             SysDepartment sysDepartment = sysDepartmentMapper.selectById(sysDoctor.getDepartmentId());
             if (sysDoctor.getId() == null) {
+                /**
+                 * 限制只有创建医生的个数
+                 *
+                 */
+                if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
+                    return ResultBody.failed("该部门创建人数已经达到上限");
+                }
                 Long sysUserId = null;
                 //保存部门信息
                 ResultBody resultBody = this.saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment, null);
@@ -263,7 +262,7 @@
                     sysGongsi.setUserId(getOne.getUserId());
                     sysGongsi.setOrgId(sysHospital.getOrgId());
                     sysGongsi.setFromId(sysDoctor.getHospitalId());
-                    sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
+                    sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL);
                     sysGongsi.setEnabled(true);
                     sysUserOrgs.add(sysGongsi);
                     sysUserOrgService.saveOrUpdate(sysGongsi);

--
Gitblit v1.8.0