From 4fb0e210e5cb9cb187b404afcaa660bf77cbcce0 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 25 Feb 2022 09:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E5=A2=9E=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3=E5=88=A4=E6=96=ADID=E5=92=8C?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/tenant/mapper/XhpcTenantMapper.java  |  4 ++++
 .../service/impl/XhpcTenantServiceImpl.java       |  4 ++--
 .../main/resources/mapper/XhpcTenantMapper.xml    | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java
index eb2a8e38..33660193 100644
--- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java
+++ b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java
@@ -23,6 +23,10 @@ public interface XhpcTenantMapper {
 
     XhpcTenantDomain selectByPrimaryKey(String tenantId);
 
+    XhpcTenantDomain selectByName(String tenantName);
+
+    XhpcTenantDomain selectByPkOrName(String tenantId, String tenantName);
+
     int updateByPrimaryKeySelective(XhpcTenantDomain record);
 
     int updateByPrimaryKey(XhpcTenantDomain record);
diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java
index 4a5a6bd5..b5429f44 100644
--- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java
+++ b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java
@@ -46,9 +46,9 @@ public class XhpcTenantServiceImpl implements XhpcTenantService {
             throw new CustomException("必填字段为空");
         }
 
-        XhpcTenantDomain tenantDomain = tenantMapper.selectByPrimaryKey(domain.getTenantId());
+        XhpcTenantDomain tenantDomain = tenantMapper.selectByPkOrName(domain.getTenantId(), domain.getTenantName());
         if(tenantDomain != null){
-            throw new CustomException("租户ID已存在");
+            throw new CustomException("租户ID或名称已存在");
         }
 
         return tenantMapper.insertSelective(domain) > 0;
diff --git a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml b/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
index abe4f23c..27d8b22e 100644
--- a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
+++ b/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
@@ -58,6 +58,21 @@
     from xhpc_tenant
     where tenant_id = #{tenantId,jdbcType=VARCHAR}
   </select>
+
+  <select id="selectByName" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
+    select
+    <include refid="Base_Column_List" />
+    from xhpc_tenant
+    where tenant_name = #{tenantName,jdbcType=VARCHAR}
+  </select>
+
+  <select id="selectByPkOrName" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
+    select
+    <include refid="Base_Column_List" />
+    from xhpc_tenant
+    where tenant_id = #{tenantId,jdbcType=VARCHAR} OR tenant_name = #{tenantName,jdbcType=VARCHAR} limit 1
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from xhpc_tenant
     where tenant_id = #{tenantId,jdbcType=VARCHAR}