From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +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-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
index 08b11d1..15d2364 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
@@ -88,7 +88,7 @@
public ResultBody checkDepName(@RequestParam Map<String, Object> params) {
params.put("page", 1);
params.put("limit", 1);
- if (sysDepartmentService.findList(params).getData().size()>0) {
+ if (sysDepartmentService.findList(params).getData().size() > 0) {
return ResultBody.failed().msg(String.format("该医院下已经存在科室 %s", params.get("departmentName")));
}
return ResultBody.ok().msg("");
@@ -108,39 +108,38 @@
return ResultBody.failed().msg(errMsg.toString());
} else {
//先检查该医院该科室是否已经存在
- Map<String, Object> checkDepartment=new HashMap<String,Object>();
- checkDepartment.put("page", 1);
- checkDepartment.put("limit", 1);
- checkDepartment.put("hospitalId",sysDepartment.getHospitalId());
- checkDepartment.put("departmentName",sysDepartment.getDepartmentName());
- if (sysDepartmentService.findList(checkDepartment).getData().size()>0) {
- return ResultBody.failed().msg(String.format("该医院下已经存在科室 %s", sysDepartment.getDepartmentName()));
+ if (sysDepartment.getId() == null) {
+ Map<String, Object> checkDepartment = new HashMap<String, Object>();
+ checkDepartment.put("page", 1);
+ checkDepartment.put("limit", 1);
+ checkDepartment.put("hospitalId", sysDepartment.getHospitalId());
+ checkDepartment.put("departmentName", sysDepartment.getDepartmentName());
+ if (sysDepartmentService.findList(checkDepartment).getData().size() > 0) {
+ return ResultBody.failed().msg(String.format("该医院下已经存在科室 %s", sysDepartment.getDepartmentName()));
+ }
}
//先检查是否存在组织信息
- SysOrganization sysOrganization=new SysOrganization();
- if(sysDepartment.getOrgId()!=null){
- sysOrganization.setId(sysDepartment.getOrgId());}
- else{
+ SysOrganization sysOrganization = new SysOrganization();
+ if (sysDepartment.getOrgId() != null) {
+ sysOrganization.setId(sysDepartment.getOrgId());
+ } else {
sysOrganization.setOrgName(sysDepartment.getDepartmentName());
//临时暂用其它字段承载数据
sysOrganization.setOrgParentId(sysDepartment.getUpdateUserId());
}
- sysOrganization=sysOrganizationService.findByObject(sysOrganization);
- if(sysOrganization==null)
- {
+ sysOrganization = sysOrganizationService.findByObject(sysOrganization);
+ if (sysOrganization == null) {
//创建一个组织
- sysOrganization=new SysOrganization();
+ sysOrganization = new SysOrganization();
sysOrganization.setOrgName(sysDepartment.getDepartmentName());
sysOrganization.setOrgAttr(2);
sysOrganization.setOrgLevel(2);
//临时暂用其它字段承载数据
sysOrganization.setOrgParentId(sysDepartment.getUpdateUserId());
- }
- else
- {
+ } else {
sysOrganization.setOrgName(sysDepartment.getDepartmentName());
}
- boolean org=sysOrganizationService.saveOrUpdate(sysOrganization);
+ boolean org = sysOrganizationService.saveOrUpdate(sysOrganization);
sysDepartment.setOrgId(sysOrganization.getId());
boolean v = sysDepartmentService.saveOrUpdate(sysDepartment);
if (v) {
--
Gitblit v1.8.0