From 62b6a7fac3f2acde70b578431147c4a01f19c182 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 15 四月 2024 09:07:05 +0800
Subject: [PATCH] bug修改
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
index 9b6196c..1984228 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import cn.hutool.core.collection.CollectionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -70,7 +71,13 @@
if (department != null) {
return ResponseValue.error("閮ㄩ棬鍚嶇О宸插瓨鍦�");
}
-
+ // 閮ㄩ棬缂栧彿
+ FinSysTenantDepartmentParam finSysTenantDepartmentParam1 = new FinSysTenantDepartmentParam();
+ finSysTenantDepartmentParam1.setCode(param.getCode());
+ List<FinSysTenantDepartment> datas = departmentService.queryDataList(finSysTenantDepartmentParam1);
+ if(!CollectionUtil.isEmpty(datas)){
+ return ResponseValue.error("姝ょ紪鍙峰凡瀛樺湪");
+ }
int result = this.departmentService.add(param, this.getSysInfo());
if (result > 0) {
return ResponseValue.success();
@@ -144,7 +151,17 @@
FinSysTenantDepartment tenantDepartment =
this.departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode());
if (tenantDepartment != null) {
- return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
+ //return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
+ }
+ // 閮ㄩ棬缂栧彿
+ FinSysTenantDepartmentParam finSysTenantDepartmentParam1 = new FinSysTenantDepartmentParam();
+ finSysTenantDepartmentParam1.setCode(param.getCode());
+ List<FinSysTenantDepartment> datas = departmentService.queryDataList(finSysTenantDepartmentParam1);
+ if(!CollectionUtil.isEmpty(datas)){
+ FinSysTenantDepartment finSysTenantDepartment1 = datas.get(0);
+ if(!finSysTenantDepartment1.getId().equals(param.getId())){
+ return ResponseValue.error("姝ょ紪鍙峰凡瀛樺湪");
+ }
}
int num = this.departmentService.updateFinSysTenantDepartment(param, sysInfo);
return num > 0 ? ResponseValue.success() : ResponseValue.error("缂栬緫澶辫触锛�");
--
Gitblit v1.9.1