diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java index eae763b0..e2be8ae7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java @@ -96,4 +96,11 @@ public interface ArchivesMapper { * @return */ List selectDetails(@Param("list") List detailsIdList); + + /** + * 根据名称查询电子档案右侧详情 + * @param archivesDetails + * @return + */ + ArchivesDetails selectDetailsUpdateName(ArchivesDetails archivesDetails); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java index 1e043fbc..51245164 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java @@ -224,7 +224,8 @@ public class ArchivesServiceImpl implements ArchivesService { @Override public AjaxResult updateDetails(ArchivesDetails archivesDetails) { // 根据类型名称和上级id查询,同级下名称不能重复 - if (isNameDuplicate(archivesDetails)) { + ArchivesDetails info = archivesMapper.selectDetailsUpdateName(archivesDetails); + if (info != null && !info.getDetailsId().equals(archivesDetails.getDetailsId())) { return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg()); } archivesDetails.setUpdateBy(SecurityUtils.getUsername()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml index 908d1842..9ab92627 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml @@ -131,6 +131,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into archives_record_info @@ -197,7 +221,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update archives_record_details - info_id = #{infoId}, parent_id = #{parentId}, doc_name = #{docName}, doc_type = #{docType},