QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2024-07-23 16:14:46 +08:00
parent 8667a78c27 3bd3860afc
commit 701ed83141
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+7 -5
View File
@@ -1513,12 +1513,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
private String mergeData2(List<Map<String, Object>> listMap, String key, boolean isDistinct) { private String mergeData2(List<Map<String, Object>> listMap, String key, boolean isDistinct) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (Map<String, Object> map : listMap) { for (Map<String, Object> map : listMap) {
String[] split = map.get(key).toString().split(","); if (map.containsKey(key)){
for (String s : split) { String[] split = map.get(key).toString().split(",");
if (isDistinct && list.contains(s)){ for (String s : split) {
continue; if (isDistinct && list.contains(s)){
continue;
}
list.add(s);
} }
list.add(s);
} }
} }
return String.join(",", list); return String.join(",", list);