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> listMap, String key, boolean isDistinct) { List list = new ArrayList<>(); for (Map 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);