From fae8a9349499cd045bc73e8fd22aeae52618a46c Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 10:02:02 +0800
Subject: [PATCH] 采购明细查询修改，查询本级及以下
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java | 23 +++++++++++++++++++++--
1 files changed, 21 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 3930667..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;
@@ -10,6 +11,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.consum.base.BaseController;
+import com.consum.base.core.type.StatesType;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.FinSysTenantDepartmentParam;
import com.consum.base.service.FinSysTenantDepartmentService;
@@ -69,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();
@@ -109,6 +117,7 @@
}
FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
finSysTenantDepartment.setTenantId(tenantId);
+ finSysTenantDepartment.setStatus(StatesType.NORMAL.getValue());
List<FinSysTenantDepartment> finSysTenantDepartments = this.departmentService.select(finSysTenantDepartment);
return ResponseValue.success(finSysTenantDepartments);
}
@@ -142,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