Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-27 3ecb43bd5455df7c541d382370c981c4ffa24853

 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);