From fc9f96e77c08e84bcb0c2c53b105910a6520ce51 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 31 May 2022 15:08:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug52732=E8=99=9A=E6=8B=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DummyInventoryBaseEOServiceImpl.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 ca2b55d58..faaa04e55 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
@@ -227,6 +227,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     @Override
     public void issue(DummyInventoryBaseEO dummyInventoryBaseEO){
         this.updateById(dummyInventoryBaseEO);
+        //不管有没有维护清单,都返回操作成功
         //发布与撤回均需要发消息(向订阅的人员发消息)
         //首次发布不发消息
         //(1)首次发布将虚拟清单的基础数据和详情数据存入维护清单内容变更表_dummy_content_change
@@ -429,13 +430,12 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
                         iDummyContentChangeEOService.saveBatch(list);
                         sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
-                        // private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
-                        //         String addSerialNumber,String deleteSerialNumber,String state,String cut) {
+
                     }else {
                         if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                            throw new JeroBootException("维护清单为空,发布失败");
+                            throw new JeroBootException("操作成功");
                         } else {
-                            throw new JeroBootException("The maintenance list is empty, and publishing failed.");
+                            throw new JeroBootException("Successful operation.");
                         }
                     }
                 }

From 04b9e8a7cfd8d1f5fcfa2f82e2a60605205fb5d3 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 31 May 2022 15:27:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug53409=E8=99=9A=E6=8B=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95log=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){