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/service/impl/FinSysTenantDepartmentServiceImpl.java |   49 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 41 insertions(+), 8 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 415b77a..5121104 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
@@ -25,8 +25,6 @@
 @Service
 public class FinSysTenantDepartmentServiceImpl extends BaseServiceImpl implements FinSysTenantDepartmentService {
 
-    private static final String QUERY_BY_CODE = "SELECT * FROM fin_sys_tenant_department WHERE CODE = ?";
-
     /**
      * @Description 鏍规嵁 閮ㄩ棬鍚嶇О鍜屾満鏋刬d 鏌ヨ閮ㄩ棬
      * @Author 鍗㈠簡闃�
@@ -44,8 +42,8 @@
         }
         // 鏈烘瀯id
         if (tenantId != null) {
-            sql.append(" and TENANT_ID =:TENANT_ID ");
-            paramts.put("TENANT_ID", tenantId);
+            sql.append(" and TENANT_ID =:tenantId ");
+            paramts.put("tenantId", tenantId);
         }
         if (!StringUtils.isEmpty(code)) {
             sql.append("and CODE = :code ");
@@ -102,8 +100,8 @@
         }
         // 鏈烘瀯id
         if (param.getTenantId() != null) {
-            sql.append(" and TENANT_ID =:TENANT_ID ");
-            paramts.put("TENANT_ID", param.getTenantId());
+            sql.append(" and TENANT_ID =:tenantId ");
+            paramts.put("tenantId", param.getTenantId());
         } else {
             sql.append(" and TENANT_ID = 100 ");
         }
@@ -165,9 +163,44 @@
 
         // 鏈烘瀯id
         if (agencyId != null) {
-            sql.append(" and TENANT_ID =:TENANT_ID ");
-            paramts.put("TENANT_ID", agencyId);
+            sql.append(" and TENANT_ID =:tenantId ");
+            paramts.put("tenantId", agencyId);
         }
         return this.select(sql.toString(), paramts, new FinSysTenantDepartment());
     }
+
+    @Override
+    public FinSysTenantDepartment getByTenantIdAndName(Long agencyId, String name) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
+        HashMap<String, Object> paramts = new HashMap<>();
+
+        // 鏈烘瀯id
+        if (agencyId != null) {
+            sql.append(" and TENANT_ID =:tenantId ");
+            paramts.put("tenantId", agencyId);
+        }
+        // name
+        if (name != null) {
+            sql.append(" and name =:name ");
+            paramts.put("name", name);
+        }
+        List<FinSysTenantDepartment> select = this.select(sql.toString(), paramts, new FinSysTenantDepartment());
+        if(select!=null && select.size()>0){
+            return select.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public List<FinSysTenantDepartment> queryDataList(FinSysTenantDepartmentParam param) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1");
+        HashMap<String, Object> paramts = new HashMap<>();
+        // 缂栧彿
+        if (!StringUtils.isEmpty(param.getCode())) {
+            sql.append(" and code =:code ");
+            paramts.put("code", param.getCode());
+        }
+        List<FinSysTenantDepartment> select = this.select(sql.toString(), paramts, new FinSysTenantDepartment());
+        return select;
+    }
 }

--
Gitblit v1.9.1