diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 0f4659ec..38ce132c 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -373,6 +373,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl collect3 = new ArrayList<>(); + boolean flag = false; String standardNumber = param.getStandardNumber(); if (StringUtils.isNotBlank(standardNumber)){ List collect1 = lawsDomesticStandards.stream().filter(LawsDomesticStandard -> LawsDomesticStandard.getStandardNumber().contains(standardNumber)).map(LawsDomesticStandard::getId).collect(Collectors.toList()); @@ -380,6 +381,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl collect2 = lawsEnterpriseStandards.stream().filter(LawsEnterpriseStandard -> LawsEnterpriseStandard.getStandardNumber().contains(standardNumber)).map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); collect3.addAll(collect1); collect3.addAll(collect2); + flag = true; } String standardName = param.getStandardName(); if (StringUtils.isNotBlank(standardName)){ @@ -389,8 +391,16 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl(); + } + } + wrapper.eq(StringUtils.isNotBlank(param.getStandardFileType()), OSSFile::getStandardFileType, param.getStandardFileType()); //限制process_manuscript字典,standardFileType值只限制在process_manuscript集合中 List process_manuscript = sysDictService.queryDictItemsByCode("process_manuscript");