From 8bd2686b73046ba6a13867078ddb4497fe95d2f3 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 18:05:46 +0800
Subject: [PATCH] 添加部门同名验证
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 9440d01..3930667 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
@@ -1,5 +1,14 @@
package com.consum.base.controller;
+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 com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.FinSysTenantDepartmentParam;
@@ -9,14 +18,11 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* @Description 閮ㄩ棬绠＄悊
@@ -38,8 +44,7 @@
*/
@ApiOperation(value = "鏂板", notes = "鏂板")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
- })
+ @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")})
@PostMapping("/add")
public ResponseValue add() {
FinSysTenantDepartmentParam param = CommonUtil.getObjFromReqBody(FinSysTenantDepartmentParam.class);
@@ -53,12 +58,14 @@
if (StringUtils.isEmpty(param.getCode())) {
return ResponseValue.error("缂栧彿涓虹┖");
}
- FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId());
+ FinSysTenantDepartment tenantDepartment =
+ departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode());
if (tenantDepartment != null) {
return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
}
- //鍒ゆ柇鍚屼竴鏈烘瀯id涓� 閮ㄩ棬鍚嶇О 鏄惁閲嶅
- FinSysTenantDepartment department = this.departmentService.getByNameAndTenantId(param.getName(), param.getTenantId());
+ // 鍒ゆ柇鍚屼竴鏈烘瀯id涓� 閮ㄩ棬鍚嶇О 鏄惁閲嶅
+ FinSysTenantDepartment department =
+ departmentService.getTenantDepartment(param.getName(), param.getTenantId(), null);
if (department != null) {
return ResponseValue.error("閮ㄩ棬鍚嶇О宸插瓨鍦�");
}
@@ -75,7 +82,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
- //濡傛灉涓嶄紶鏈烘瀯id锛岄粯璁ゆ煡鐪佺骇鏈烘瀯鐨勯儴闂�
+ // 濡傛灉涓嶄紶鏈烘瀯id锛岄粯璁ゆ煡鐪佺骇鏈烘瀯鐨勯儴闂�
@GetMapping("/list")
public ResponseValue queryList() {
FinSysTenantDepartmentParam param = CommonUtil.getObjFromReq(FinSysTenantDepartmentParam.class);
@@ -91,11 +98,9 @@
return ResponseValue.success(pager);
}
-
@ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�", notes = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
- })
+ @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")})
@GetMapping("/list/all")
public ResponseValue queryAllDepartment(Long tenantId) {
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -134,7 +139,8 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId());
+ FinSysTenantDepartment tenantDepartment =
+ this.departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode());
if (tenantDepartment != null) {
return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
}
@@ -184,6 +190,4 @@
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
-
}
-
--
Gitblit v1.9.1