Merge remote-tracking branch 'origin/master'

liuke

2020-12-11 e80adff2cfff2fa9d29aff9e5a7f2feb52681ef8

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