From 08a20d339816843f9ee17ba2f0f655e9c0c8b548 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 17 Jan 2024 15:19:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=2080?=
 =?UTF-8?q?780?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documenttool/mapper/DocumentSplitMapper.java     |  6 ++++++
 .../documenttool/mapper/xml/DocumentSplitMapper.xml  | 10 ++++++++++
 .../service/impl/DocumentSplitServiceImpl.java       | 12 ++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

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<LawsDocumentSplit> queryLawsDocumentSplitInIds(List<String> idList);
+
+    /**
+     * 文档拆分详情-查询menuId分组数量
+     * @param infoId
+     */
+    List<String> 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 @@
         </foreach>
     </select>
 
+    <select id="queryLawsDocumentSplitGroupByMenuId" resultType="java.lang.String">
+        SELECT *
+        FROM (SELECT menu_id, COUNT(*) count
+              FROM laws_document_split
+              WHERE info_id = #{infoId}
+              GROUP BY menu_id
+              ORDER BY count DESC) t
+        WHERE count > 1
+    </select>
+
 
     <update id="editDocumentSplitDetail">
         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<LawsDocumentSplit> lawsDocumentSplits = documentSplitMapper.queryLawsDocumentSplitInIds(Collections.singletonList((String) firstData.get(ID)));
+            List<String> 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);
+            }
         }
 
         // 修改条目