diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java index d22fad02..89dbebc0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java @@ -203,4 +203,10 @@ public interface DocumentSplitMapper { * @param idList */ List queryLawsDocumentSplitInIds(List idList); + + /** + * 文档拆分详情-查询menuId分组数量 + * @param infoId + */ + List queryLawsDocumentSplitGroupByMenuId(@Param("infoId") String infoId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 284db577..5a096e43 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -256,6 +256,16 @@ + + UPDATE laws_document_split diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 0bb82733..1fd6f200 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -727,8 +727,16 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { .collect(Collectors.toList()); if (!menuIdList.isEmpty()){ - // 删除旧数据 - documentSplitMapper.sarFileSplitMenuDeleteByIdList(menuIdList); + // 判断被合并条款之前有没有复制过,复制过则不删除相关目录 + List lawsDocumentSplits = documentSplitMapper.queryLawsDocumentSplitInIds(Collections.singletonList((String) firstData.get(ID))); + List menuIds = documentSplitMapper.queryLawsDocumentSplitGroupByMenuId(lawsDocumentSplits.get(0).getInfoId()); + if (CollectionUtils.isNotEmpty(menuIds)){ + menuIdList = menuIdList.stream().filter(v -> !menuIds.contains(v)).collect(Collectors.toList()); + } + if (!menuIdList.isEmpty()){ + // 删除旧数据 + documentSplitMapper.sarFileSplitMenuDeleteByIdList(menuIdList); + } } // 修改条目