From 76616400ee139c495f53ef727b26df27478c5c99 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sat, 08 Aug 2020 12:00:35 +0800
Subject: [PATCH] 调整运营统计部分接口

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 15d2364..7dac69e 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
@@ -13,6 +13,7 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.*;
@@ -99,6 +100,7 @@
      */
     @ApiOperation(value = "保存")
     @PostMapping
+    @Transactional(rollbackFor = {Exception.class})
     public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment, BindingResult bindingResult) {
         List<String> errMsg = new ArrayList<>();
         if (bindingResult.hasErrors()) {
@@ -112,7 +114,6 @@
                 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()));
@@ -139,7 +140,7 @@
             } else {
                 sysOrganization.setOrgName(sysDepartment.getDepartmentName());
             }
-            boolean org = sysOrganizationService.saveOrUpdate(sysOrganization);
+            boolean org = sysOrganizationService.saveOrUpdateSer(sysOrganization);
             sysDepartment.setOrgId(sysOrganization.getId());
             boolean v = sysDepartmentService.saveOrUpdate(sysDepartment);
             if (v) {

--
Gitblit v1.8.0