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/service/impl/FinSysTenantDepartmentServiceImpl.java | 59 ++++++++++++++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 35 deletions(-)
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 c1657c7..415b77a 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
@@ -1,5 +1,11 @@
package com.consum.base.service.impl;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
import com.consum.base.Constants;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.FinSysTenantDepartmentParam;
@@ -10,12 +16,6 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
/**
* @Description 閮ㄩ棬绠＄悊
@@ -33,20 +33,26 @@
* @Date 2023/10/26
*/
@Override
- public FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId) {
+ public FinSysTenantDepartment getTenantDepartment(String name, Long tenantId, String code) {
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //閮ㄩ棬鍚嶇О
+ // 閮ㄩ棬鍚嶇О
if (!StringUtils.isEmpty(name)) {
sql.append(" and name =:name ");
paramts.put("name", name);
}
- //鏈烘瀯id
+ // 鏈烘瀯id
if (tenantId != null) {
sql.append(" and TENANT_ID =:TENANT_ID ");
paramts.put("TENANT_ID", tenantId);
}
+ if (!StringUtils.isEmpty(code)) {
+ sql.append("and CODE = :code ");
+ paramts.put("code", code);
+ }
+
+ sql.append("and status = 1");
return this.get(sql.toString(), paramts, new FinSysTenantDepartment());
}
@@ -61,9 +67,9 @@
BeanUtils.copyProperties(param, department);
department.setId(IdUtil.generateId());
- //鍒涘缓浜哄鍚�
+ // 鍒涘缓浜哄鍚�
department.setCreateBy(sysInfo.getUserName());
- //鍒涘缓鏃堕棿
+ // 鍒涘缓鏃堕棿
department.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
return this.insert(department);
@@ -79,22 +85,22 @@
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
HashMap<String, Object> paramts = new HashMap<>();
- //閮ㄩ棬鍚嶇О
+ // 閮ㄩ棬鍚嶇О
if (!StringUtils.isEmpty(param.getName())) {
sql.append(" and name like:name ");
paramts.put("name", StringUtils.CHAR_PERCENT + param.getName() + StringUtils.CHAR_PERCENT);
}
- //缂栧彿
+ // 缂栧彿
if (!StringUtils.isEmpty(param.getCode())) {
sql.append(" and code like:code ");
paramts.put("code", StringUtils.CHAR_PERCENT + param.getCode() + StringUtils.CHAR_PERCENT);
}
- //鐘舵��
+ // 鐘舵��
if (param.getStatus() != null) {
sql.append(" and status =:status ");
paramts.put("status", param.getStatus());
}
- //鏈烘瀯id
+ // 鏈烘瀯id
if (param.getTenantId() != null) {
sql.append(" and TENANT_ID =:TENANT_ID ");
paramts.put("TENANT_ID", param.getTenantId());
@@ -104,23 +110,6 @@
sql.append(" ORDER BY ORDER_NUM,CREATE_TIME DESC ");
return selectSplit(sql.toString(), paramts, new FinSysTenantDepartment());
- }
-
- @Override
- 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 {
- return select.get(0);
- }
}
/**
@@ -156,9 +145,9 @@
@Override
public int updateById(FinSysTenantDepartment department, FinSysTenantUser currentUser) {
department.setIsDelete(Constants.IS_DELETE_YES);
- //鍒犻櫎鏃堕棿
+ // 鍒犻櫎鏃堕棿
department.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- //鍒犻櫎浜哄鍚�
+ // 鍒犻櫎浜哄鍚�
department.setUpdateBy(currentUser.getUserName());
return this.update(department);
}
@@ -174,7 +163,7 @@
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯id
+ // 鏈烘瀯id
if (agencyId != null) {
sql.append(" and TENANT_ID =:TENANT_ID ");
paramts.put("TENANT_ID", agencyId);
--
Gitblit v1.9.1