diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java index c7b7367a..7a8e3a6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java @@ -38,7 +38,6 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.stream.Collectors; /** @@ -228,20 +227,16 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl v.getFileName().endsWith(".pdf") - || v.getFileName().endsWith(".docx") - || v.getFileName().endsWith(".doc")).collect(Collectors.toList()); - // 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 String[] fileTypeArr = {FieldCommon.FILE_PUBLISH_OF_ORIGINAL, FieldCommon.FILE_MODIFICATION_LIST, FieldCommon.FILE_DRAFT_FOR_REVIEW, FieldCommon.FILE_DRAFT_FOR_APPROVAL, FieldCommon.FILE_DRAFT_FOR_COMMENT, FieldCommon.FILE_DRAFT}; for (String fileType : fileTypeArr) { - Optional optional = list.stream().filter(v -> - fileType.equals(v.getStandardFileType())).findFirst(); - + Optional optional = list.stream() + .filter(v -> fileType.equals(v.getStandardFileType()) + && (v.getFileName().endsWith(".pdf") + || v.getFileName().endsWith(".docx") + || v.getFileName().endsWith(".doc"))).findFirst(); if (optional.isPresent()){ return optional.get(); }