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 | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 d2850bf..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);
@@ -246,12 +245,12 @@
}
}
Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("user_id", sysDoctor.getUserId());
+ columnMap.put("user_id", getOne.getUserId());
boolean b = sysUserOrgService.removeByMap(columnMap);
//保存将sys_user_org
SysUserOrg sysUserOrg = new SysUserOrg();
sysUserOrg.setUserId(getOne.getUserId());
- sysUserOrg.setEnabled(false);
+ sysUserOrg.setEnabled(true);
sysUserOrg.setFromId(sysDoctor.getDepartmentId());
sysUserOrg.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
sysUserOrg.setOrgId(sysDepartment.getOrgId());
@@ -260,10 +259,11 @@
sysUserOrgs.add(sysUserOrg);
sysUserOrgService.saveOrUpdate(sysUserOrg);
SysUserOrg sysGongsi = new SysUserOrg();
- sysGongsi.setUserId(getOne.getId());
+ 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);
baseMapper.updateById(sysDoctor);
@@ -378,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