Merge remote-tracking branch 'origin/master'

2024-07-23 16:14:46 +08:00
parent 8667a78c27 3bd3860afc
commit 701ed83141
1 changed files with 7 additions and 5 deletions
@@ -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);