diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index eca57a871..d022c254e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -521,23 +521,84 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map : mapList) { - Map mapTemp = new HashMap<>(); + Map stringObjectMap = new HashMap<>(); //对应标准处理 if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) { - correspondingStandardNameList.add((String) map.get("serial_number")); - mapTemp.put("title", (String) map.get("serial_number")); - mapTemp.put("id", (String) map.get("id")); - if (ObjectUtils.isNotEmpty(mapTemp)) { - listCorrespondingStandard.add(mapTemp); + for (String s : correspondingStandardId.split(",")) { + Map mapTemp = new HashMap<>(); + if(s.equals((String) map.get("id"))){ + correspondingStandardNameList.add((String) map.get("serial_number")); + mapTemp.put("title", (String) map.get("serial_number")); + mapTemp.put("id", (String) map.get("id")); + if (ObjectUtils.isNotEmpty(mapTemp)) { + listCorrespondingStandard.add(mapTemp); + } + }else{ + boolean flag = isId(s); + if(!flag && !correspondingStandardNameList.contains(s)){ + correspondingStandardNameList.add(s); + mapTemp.put("title", s); + mapTemp.put("id", ""); + if (ObjectUtils.isNotEmpty(mapTemp)) { + listCorrespondingStandard.add(mapTemp); + } + } + } } + }else{ + if(StringUtils.isNotBlank(correspondingStandardId)){ + for (String s : correspondingStandardId.split(",")) { + Map mapTemp = new HashMap<>(); + boolean flag = isId(s); + if(!flag && !correspondingStandardNameList.contains(s)){ + correspondingStandardNameList.add(s); + mapTemp.put("title", s); + mapTemp.put("id", ""); + if (ObjectUtils.isNotEmpty(mapTemp)) { + listCorrespondingStandard.add(mapTemp); + } + } + } + } + } //代替标准 if (StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))) { - replaceStandardNameList.add((String) map.get("serial_number")); - mapTemp.put("title", (String) map.get("serial_number")); - mapTemp.put("id", (String) map.get("id")); - if (ObjectUtils.isNotEmpty(mapTemp)) { - listReplaceStandard.add(mapTemp); + for (String s : replaceStandardId.split(",")) { + Map mapTemp = new HashMap<>(); + if(s.equals((String) map.get("id"))){ + replaceStandardNameList.add((String) map.get("serial_number")); + mapTemp.put("title", (String) map.get("serial_number")); + mapTemp.put("id", (String) map.get("id")); + if (ObjectUtils.isNotEmpty(mapTemp)) { + listReplaceStandard.add(mapTemp); + } + }else{ + boolean flag = isId(s); + if(!flag && !replaceStandardNameList.contains(s)){ + replaceStandardNameList.add(s); + mapTemp.put("title", s); + mapTemp.put("id", ""); + if (ObjectUtils.isNotEmpty(mapTemp)) { + listReplaceStandard.add(mapTemp); + } + } + } + } + }else{ + if(StringUtils.isNotBlank(replaceStandardId)){ + for (String s : replaceStandardId.split(",")) { + Map mapTemp = new HashMap<>(); + boolean flag = isId(s); + if(!flag && !replaceStandardNameList.contains(s)){ + replaceStandardNameList.add(s); + mapTemp.put("title", s); + mapTemp.put("id", ""); + if (ObjectUtils.isNotEmpty(mapTemp)) { + listReplaceStandard.add(mapTemp); + } + } + } } } //被代替标准 @@ -546,10 +607,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl