From 73379c4c734bae73a799a65954536fa41fb83e56 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 10 Aug 2020 09:05:13 +0800
Subject: [PATCH] c端  不添加数据user

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 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..4391def 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,9 +1,11 @@
 package com.kidgrow.usercenter.controller;
 
+import com.kidgrow.common.annotation.LoginUser;
 import com.kidgrow.common.controller.BaseController;
 import com.kidgrow.common.model.PageResult;
 import com.kidgrow.common.model.ResultBody;
 import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.model.SysUser;
 import com.kidgrow.usercenter.model.SysDepartment;
 import com.kidgrow.usercenter.service.ISysDepartmentService;
 import com.kidgrow.usercenter.service.ISysOrganizationService;
@@ -13,6 +15,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.*;
@@ -88,7 +91,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("");
@@ -99,7 +102,8 @@
      */
     @ApiOperation(value = "保存")
     @PostMapping
-    public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment, BindingResult bindingResult) {
+    @Transactional(rollbackFor = {Exception.class})
+    public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment, BindingResult bindingResult,@LoginUser SysUser sysUser) {
         List<String> errMsg = new ArrayList<>();
         if (bindingResult.hasErrors()) {
             for (ObjectError error : bindingResult.getAllErrors()) {
@@ -108,39 +112,40 @@
             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("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
-            {
+                if(!sysUser.getOrganizations().isEmpty()){
+                    sysOrganization.setCreateUserOrgCode(sysUser.getOrganizations().get(1).getOrgCode());
+                }
+            } 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