diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index faaa04e55..46c7afa98 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -717,19 +717,25 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); //设计符合性确认交付物模板 if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){ deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(","))); + }else { + dummyInventoryInfoEO.setDesignDeliverableTemplateName("空"); } // Prehomo确认交付物模板 if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){ deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(","))); + }else { + dummyInventoryInfoEO.setPrehomoDeliverableTemplateName("空"); } // 验证符合性确认交付物模板 if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){ deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(","))); + }else { + dummyInventoryInfoEO.setVerifyDeliverableTemplateName("空"); } List fileInfos = new ArrayList<>(); if(deliverableList.size() != 0){ @@ -763,7 +769,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList()); - sb.append(collect.get(0).getFileName() + ","); + if (CollectionUtils.isNotEmpty(collect)) { + sb.append(collect.get(0).getFileName() + ","); + } } String sbStr = ""; if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 80f613b9d..42dfce7e1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2082,14 +2082,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl fileInfos = new ArrayList<>(); if(deliverableList.size() != 0){