From 25b639f34bd7e80a69cdb5b46b2d082c1590d033 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 08 十二月 2023 13:13:04 +0800
Subject: [PATCH] feat: 部门管理-新增报错 Closes #12537
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java | 13 +++++--------
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java | 17 +++++++++++++----
consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java | 2 +-
3 files changed, 19 insertions(+), 13 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 fa64b01..9440d01 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
@@ -13,13 +13,10 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @Description 閮ㄩ棬绠＄悊
@@ -56,7 +53,7 @@
if (StringUtils.isEmpty(param.getCode())) {
return ResponseValue.error("缂栧彿涓虹┖");
}
- FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode());
+ FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId());
if (tenantDepartment != null) {
return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
}
@@ -137,7 +134,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode());
+ FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId());
if (tenantDepartment != null) {
return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
index 99c4151..c8be330 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
@@ -26,7 +26,7 @@
*/
GenericPager<FinSysTenantDepartment> queryList(FinSysTenantDepartmentParam param);
- FinSysTenantDepartment selectByCode(String code);
+ FinSysTenantDepartment selectByCode(String code,Long id);
/**
* @Description 缂栬緫
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
index 8a7b2a9..c1657c7 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
@@ -10,10 +10,12 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.HashMap;
-import java.util.List;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
/**
* @Description 閮ㄩ棬绠＄悊
@@ -105,8 +107,15 @@
}
@Override
- public FinSysTenantDepartment selectByCode(String code) {
- List<FinSysTenantDepartment> select = this.select(QUERY_BY_CODE, new Object[]{code}, new FinSysTenantDepartment());
+ public FinSysTenantDepartment selectByCode(String code, Long id) {
+ StringBuilder sql = new StringBuilder(QUERY_BY_CODE);
+ ArrayList<Object> param = new ArrayList<>(2);
+ param.add(code);
+ if (id != null) {
+ sql.append(" and id != ?");
+ param.add(id);
+ }
+ List<FinSysTenantDepartment> select = this.select(sql.toString(), param.toArray(), new FinSysTenantDepartment());
if (StringUtils.isEmptyList(select)) {
return null;
} else {
--
Gitblit v1.9.1