From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +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/SysDoctorServiceImpl.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 f5a92fc..8075fae 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);
@@ -379,6 +378,7 @@
             sysUser.setType(UserType.DOCTOR.name());
             sysUser.setTenantId(CommonConstant.H_TENANT);
             sysUser.setCreateTime(new Date());
+            sysUser.setDefaultAuth(true);
             SysUser byId = iSysUserService.getById(id);
             if (byId != null) {
                 sysUser.setCreateUserId(byId.getId());

--
Gitblit v1.8.0