From 04b9e8a7cfd8d1f5fcfa2f82e2a60605205fb5d3 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 31 May 2022 15:27:50 +0800
Subject: [PATCH] =?UTF-8?q?bug53409=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95log?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java        | 12 ++++++++++--
 .../impl/ProjectLawsInventoryEOServiceImpl.java      |  6 ++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

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<DummyInventoryB
             }else {
                 dummyInventoryInfoEO.setVerifyDuty("空");
             }
-//文件
+            //文件
             List<String> 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<OSSFile> fileInfos = new ArrayList<>();
             if(deliverableList.size() != 0){
@@ -763,7 +769,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
         StringBuilder sb = new StringBuilder();
         for (String s : deliverableTemplate.split(",")) {
             List<OSSFile> 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<ProjectLawsIn
 			//设计符合性确认交付物模板
 			if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
 				deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
+			}else {
+				projectLawsInventoryEO.setDesignDeliverableTemplateName("空");
 			}
 			// Prehomo确认交付物模板
 			if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
 				deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
+			}else {
+				projectLawsInventoryEO.setPrehomoDeliverableTemplateName("空");
 			}
 			// 验证符合性确认交付物模板
 			if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
 				deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
+			}else {
+				projectLawsInventoryEO.setVerifyDeliverableTemplateName("空");
 			}
 			List<OSSFile> fileInfos = new ArrayList<>();
 			if(deliverableList.size() != 0){