From 6de669dc80d8f7bf87854c2a1261f74d7d87acde Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 23 Jul 2024 16:12:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(87286):=20=E6=96=87=E6=A1=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86--=E7=BC=96=E8=BE=91-=E5=90=88=E5=B9=B6=E6=9D=A1?=
 =?UTF-8?q?=E6=AC=BE=E9=98=BB=E5=A1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DocumentSplitServiceImpl.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 7ae35c33..99b81aa5 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
@@ -1513,12 +1513,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     private String mergeData2(List<Map<String, Object>> listMap, String key, boolean isDistinct) {
         List<String> list = new ArrayList<>();
         for (Map<String, Object> map : listMap) {
-            String[] split = map.get(key).toString().split(",");
-            for (String s : split) {
-                if (isDistinct && list.contains(s)){
-                    continue;
+            if (map.containsKey(key)){
+                String[] split = map.get(key).toString().split(",");
+                for (String s : split) {
+                    if (isDistinct && list.contains(s)){
+                        continue;
+                    }
+                    list.add(s);
                 }
-                list.add(s);
             }
         }
         return String.join(",", list);