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..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 @@ -227,6 +227,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl 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 baseDiff, String idTemp,List> 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."); } } } @@ -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){