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 66a12e33..0f4659ec 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 @@ -372,12 +372,14 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl(); } } + List collect3 = new ArrayList<>(); String standardNumber = param.getStandardNumber(); if (StringUtils.isNotBlank(standardNumber)){ List collect1 = lawsDomesticStandards.stream().filter(LawsDomesticStandard -> LawsDomesticStandard.getStandardNumber().contains(standardNumber)).map(LawsDomesticStandard::getId).collect(Collectors.toList()); wrapper.in(!collect1.isEmpty(), OSSFile::getStandardId, collect1); List collect2 = lawsEnterpriseStandards.stream().filter(LawsEnterpriseStandard -> LawsEnterpriseStandard.getStandardNumber().contains(standardNumber)).map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); - wrapper.in(!collect2.isEmpty(), OSSFile::getStandardId, collect2); + collect3.addAll(collect1); + collect3.addAll(collect2); } String standardName = param.getStandardName(); if (StringUtils.isNotBlank(standardName)){ @@ -385,7 +387,10 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl collect2 = lawsEnterpriseStandards.stream().filter(LawsEnterpriseStandard -> LawsEnterpriseStandard.getStandardName().contains(standardName)).map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); wrapper.in(!collect2.isEmpty(), OSSFile::getStandardId, collect2); + collect3.addAll(collect1); + collect3.addAll(collect2); } + wrapper.in(!collect3.isEmpty(), OSSFile::getStandardId, collect3.stream().distinct().collect(Collectors.toList())); wrapper.eq(StringUtils.isNotBlank(param.getStandardFileType()), OSSFile::getStandardFileType, param.getStandardFileType()); //限制process_manuscript字典,standardFileType值只限制在process_manuscript集合中 List process_manuscript = sysDictService.queryDictItemsByCode("process_manuscript");