From 0928fba7cd5576d2932859b1d4942464c720d92f Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 17 Apr 2020 19:03:08 +0800
Subject: [PATCH] 1.组织数据功能分离独立成模块 2.组织,医院,科室添加/修改功能 3.本周整理制作了3类JS通用插件(字典分类加载下来列表通用组件,省市区联动通用组件,文本框按输入内容自动搜索提示数据通用组件)

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 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 157e44f..e06449c 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
@@ -1,28 +1,24 @@
 package com.kidgrow.usercenter.controller;
 
-import java.util.Map;
 import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.usercenter.model.SysDepartment;
+import com.kidgrow.usercenter.service.ISysDepartmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysDepartment;
-import com.kidgrow.usercenter.service.ISysDepartmentService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 
 /**
@@ -91,6 +87,14 @@
             }
             return ResultBody.failed().msg(errMsg.toString());
         } else {
+            //先检查该医院下的该科室名是否已经存在?
+            SysDepartment sysDepartmentTemp=new SysDepartment();
+            sysDepartmentTemp.setHospitalId(sysDepartment.getHospitalId());
+            sysDepartmentTemp.setDepartmentName(sysDepartment.getDepartmentName().trim());
+            sysDepartmentTemp=sysDepartmentService.findByObject(sysDepartmentTemp);
+            if (sysDepartmentTemp!=null) {
+                return ResultBody.failed().msg(String.format("该医院下已经存在 %s",sysDepartment.getDepartmentName()));
+            }
             boolean v= sysDepartmentService.saveOrUpdate(sysDepartment);
             if(v) {
                 return ResultBody.ok().data(sysDepartment).msg("保存成功");

--
Gitblit v1.8.0