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

fix(87286): 文档拆分--编辑-合并条款阻塞

Browse Source
This commit is contained in:
yjz
2024-07-23 16:12:12 +08:00
parent 8a2b8b8335
commit 6de669dc80
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
+2
View File
@@ -1513,6 +1513,7 @@ 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) {
if (map.containsKey(key)){
String[] split = map.get(key).toString().split(","); String[] split = map.get(key).toString().split(",");
for (String s : split) { for (String s : split) {
if (isDistinct && list.contains(s)){ if (isDistinct && list.contains(s)){
@@ -1521,6 +1522,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
list.add(s); list.add(s);
} }
} }
}
return String.join(",", list); return String.join(",", list);
} }