ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): 78337

Browse Source
This commit is contained in:
yjz
2023-11-08 16:37:40 +08:00
parent 4054c568d6
commit e11edb4bc5
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+11 -1
View File
@@ -373,6 +373,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
}
}
List<String> collect3 = new ArrayList<>();
boolean flag = false;
String standardNumber = param.getStandardNumber();
if (StringUtils.isNotBlank(standardNumber)){
List<String> collect1 = lawsDomesticStandards.stream().filter(LawsDomesticStandard -> LawsDomesticStandard.getStandardNumber().contains(standardNumber)).map(LawsDomesticStandard::getId).collect(Collectors.toList());
@@ -380,6 +381,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
List<String> 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<SarFileSplitInfoMap
wrapper.in(!collect2.isEmpty(), OSSFile::getStandardId, collect2);
collect3.addAll(collect1);
collect3.addAll(collect2);
flag = true;
}
wrapper.in(!collect3.isEmpty(), OSSFile::getStandardId, collect3.stream().distinct().collect(Collectors.toList()));
if (flag){
if (!collect3.isEmpty()){
wrapper.in(OSSFile::getStandardId, collect3.stream().distinct().collect(Collectors.toList()));
}else {
return new Page<>();
}
}
wrapper.eq(StringUtils.isNotBlank(param.getStandardFileType()), OSSFile::getStandardFileType, param.getStandardFileType());
//限制process_manuscript字典，standardFileType值只限制在process_manuscript集合中
List<DictModel> process_manuscript = sysDictService.queryDictItemsByCode("process_manuscript");