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} + +