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 3de8336ee..bcc3ef858 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 @@ -477,6 +477,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl replaceStandardNameList = new ArrayList<>();//代替标准 List replacedStandardNameList = new ArrayList<>();//被代替标准 + List replacedStandardIdList = new ArrayList<>();//被代替标准 List correspondingStandardNameList = new ArrayList<>();//对应标准 for (Map map : mapList) { //对应标准处理 @@ -531,6 +532,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stringObjectMap : mapList) { String replaceStandard = (String) stringObjectMap.get("replace_standard"); - if(replaceStandard.contains((String)entry.getValue())){ + if(StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains((String)entry.getValue())){ standSb.append(stringObjectMap.get("serial_number")+","); } } @@ -1094,8 +1097,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl