From b1e31ec089d5274d4bede00a761e42f732bc1db4 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Tue, 17 May 2022 17:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=87=8D=E5=A4=8D=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/activity/mapper/XhpcWorkTypeDictMapper.java   |  2 +-
 .../activity/service/impl/WorkTypeServiceImpl.java     |  4 ++--
 .../main/resources/mapper/XhpcWorkTypeDictMapper.xml   | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkTypeDictMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkTypeDictMapper.java
index df85d241..ca5e9685 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkTypeDictMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkTypeDictMapper.java
@@ -23,7 +23,7 @@ public interface XhpcWorkTypeDictMapper {
 
     XhpcWorkTypeDictDomain selectByPrimaryKey(Integer workTypeId);
 
-    XhpcWorkTypeDictDomain selectByName(String name);
+    XhpcWorkTypeDictDomain selectByName(@Param("name") String name, @Param("parentId")Integer parentId);
 
     int updateByPrimaryKeySelective(XhpcWorkTypeDictDomain record);
 
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
index 07168494..92a64187 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
@@ -67,7 +67,7 @@ public class WorkTypeServiceImpl implements WorkTypeService {
         if(StringUtils.isEmpty(domain.getName())){
             throw new CustomException("名称不能为空");
         }
-        XhpcWorkTypeDictDomain exitsDomain = typeDictMapper.selectByName(domain.getName());
+        XhpcWorkTypeDictDomain exitsDomain = typeDictMapper.selectByName(domain.getName(), domain.getParentTypeId());
         if(exitsDomain != null) {
             throw new CustomException("名称不能重复");
         }
@@ -86,7 +86,7 @@ public class WorkTypeServiceImpl implements WorkTypeService {
             throw new CustomException("自身不能成为自身的子集");
         }
 
-        XhpcWorkTypeDictDomain exitsDomain = typeDictMapper.selectByName(domain.getName());
+        XhpcWorkTypeDictDomain exitsDomain = typeDictMapper.selectByName(domain.getName(), domain.getParentTypeId());
         if(exitsDomain != null && !exitsDomain.getWorkTypeId().equals(domain.getWorkTypeId())) {
             throw new CustomException("名称不能重复");
         }
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
index 72050322..587474b6 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
@@ -68,11 +68,21 @@
     from xhpc_work_type_dict
     where work_type_id = #{workTypeId,jdbcType=INTEGER}
   </select>
+
+
   <select id="selectByName" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_type_dict
     where del_flag=0 and name = #{name}
+    <choose>
+      <if test="parentId == null">
+        and parent_type_id is null
+      </if>
+      <otherwise>
+         and parent_type_id=#{parentId}
+      </otherwise>
+    </choose>
   </select>
 
   <update id="deleteByPrimaryKeyLogic" parameterType="java.lang.Integer">