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

fix(文档对比): 树形结构查询问题修复

Browse Source
This commit is contained in:
yjz
2023-10-20 17:42:00 +08:00
parent bdc69a995a
commit a9e7668a61
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+1
View File
@@ -30,6 +30,7 @@ public class FieldCommon {
LawsFieldTypeEnum.FILE_UP.getValue(), // 上传文件
LawsFieldTypeEnum.OPTION_SINGLE.getValue(), // 下拉单选
LawsFieldTypeEnum.TREE_BOX_SINGLE.getValue(), // 树型单选
LawsFieldTypeEnum.TREE_BOX.getValue(), // 树型多选
LawsFieldTypeEnum.OPTION_MANY.getValue() // 下拉多选
);
laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+4 -4
View File
@@ -375,16 +375,16 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
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());
wrapper.in(OSSFile::getStandardId, collect1);
wrapper.in(!collect1.isEmpty(), OSSFile::getStandardId, collect1);
List<String> collect2 = lawsEnterpriseStandards.stream().filter(LawsEnterpriseStandard -> LawsEnterpriseStandard.getStandardNumber().contains(standardNumber)).map(LawsEnterpriseStandard::getId).collect(Collectors.toList());
wrapper.in(OSSFile::getStandardId, collect2);
wrapper.in(!collect2.isEmpty(), OSSFile::getStandardId, collect2);
}
String standardName = param.getStandardName();
if (StringUtils.isNotBlank(standardName)){
List<String> collect1 = lawsDomesticStandards.stream().filter(LawsDomesticStandard -> LawsDomesticStandard.getStandardName().contains(standardName)).map(LawsDomesticStandard::getId).collect(Collectors.toList());
wrapper.in(OSSFile::getStandardId, collect1);
wrapper.in(!collect1.isEmpty(), OSSFile::getStandardId, collect1);
List<String> collect2 = lawsEnterpriseStandards.stream().filter(LawsEnterpriseStandard -> LawsEnterpriseStandard.getStandardName().contains(standardName)).map(LawsEnterpriseStandard::getId).collect(Collectors.toList());
wrapper.in(OSSFile::getStandardId, collect2);
wrapper.in(!collect2.isEmpty(), OSSFile::getStandardId, collect2);
}
wrapper.eq(StringUtils.isNotBlank(param.getStandardFileType()), OSSFile::getStandardFileType, param.getStandardFileType());
//限制process_manuscript字典，standardFileType值只限制在process_manuscript集合中