From 4c8123b84a0e7ab9d2421f202e1d4219ffba42ed Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 16 Mar 2026 14:06:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(department):=20=E6=9B=B4=E6=96=B0=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=E9=83=A8=E9=97=A8=E7=B1=BB=E5=9E=8B=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/domain/command/DomainDepartmentAddExe.java | 3 +-- .../zcloud/domain/command/DomainDepartmentUpdateExe.java | 3 +++ .../repository/DomainDepartmentRepository.java | 3 ++- .../repository/impl/DomainDepartmentRepositoryImpl.java | 8 +++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentAddExe.java b/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentAddExe.java index a41f5ec..72da175 100644 --- a/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentAddExe.java +++ b/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentAddExe.java @@ -3,7 +3,6 @@ package com.zcloud.domain.command; import com.alibaba.cola.exception.BizException; import com.zcloud.domain.command.convertor.DomainDepartmentUserCoConvertor; import com.zcloud.domain.domain.gateway.DomainDepartmentGateway; -import com.zcloud.domain.domain.gateway.DomainDepartmentUserGateway; import com.zcloud.domain.domain.model.DomainDepartmentE; import com.zcloud.domain.dto.DomainDepartmentAddCmd; import com.zcloud.domain.dto.DomainDepartmentUserAddCmd; @@ -36,7 +35,7 @@ public class DomainDepartmentAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(DomainDepartmentAddCmd cmd) { //查询领域类型是否存在 - domainDepartmentRepository.checkDomainType(cmd.getDomainType()); + domainDepartmentRepository.checkDomainType(cmd.getDomainType(), null); DomainDepartmentE domainDepartmentE = new DomainDepartmentE(); BeanUtils.copyProperties(cmd, domainDepartmentE); boolean res = false; diff --git a/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentUpdateExe.java b/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentUpdateExe.java index 160df4c..3d3b441 100644 --- a/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/domain/command/DomainDepartmentUpdateExe.java @@ -45,6 +45,9 @@ public class DomainDepartmentUpdateExe { if (info == null) { throw new BizException("领域管理部门不存在"); } + //查询领域类型是否存在 + domainDepartmentRepository.checkDomainType(domainDepartmentUpdateCmd.getDomainType(),domainDepartmentUpdateCmd.getId()); + DomainDepartmentE domainDepartmentE = new DomainDepartmentE(); BeanUtils.copyProperties(domainDepartmentUpdateCmd, domainDepartmentE); boolean res = domainDepartmentGateway.update(domainDepartmentE); diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainDepartmentRepository.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainDepartmentRepository.java index 6aac74c..949bbde 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainDepartmentRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainDepartmentRepository.java @@ -5,6 +5,7 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.domain.persistence.dataobject.DomainDepartmentDO; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; import java.util.Map; @@ -17,7 +18,7 @@ import java.util.Map; public interface DomainDepartmentRepository extends BaseRepository { PageResponse listPage(Map params); - void checkDomainType(@NotEmpty(message = "领域类型不能为空") String domainType); + void checkDomainType(@NotEmpty(message = "领域类型不能为空") String domainType, Long id); DomainDepartmentDO getInfoById(Long id); diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java index eca1acb..a581d57 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java @@ -10,12 +10,11 @@ import com.zcloud.domain.domain.enums.MenuEnum; import com.zcloud.domain.persistence.dataobject.DomainDepartmentDO; import com.zcloud.domain.persistence.mapper.DomainDepartmentMapper; import com.zcloud.domain.persistence.repository.DomainDepartmentRepository; -import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Collections; +import javax.validation.constraints.NotNull; import java.util.List; import java.util.Map; @@ -42,9 +41,12 @@ public class DomainDepartmentRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("domain_type", domainType); + if(id != null){ + queryWrapper.ne("id", id); + } List list = list(queryWrapper); if (CollUtil.isNotEmpty(list)) { throw new RuntimeException("该领域类型已存在");