From a9e7668a61ee5b9af888c65dc2271b8dab4d7ae7 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 20 Oct 2023 17:42:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94):=20?= =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/common/constant/FieldCommon.java | 1 + .../split/service/impl/SarFileSplitInfoServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index 7d424e74..85f7f725 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -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() // 下拉多选 ); 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 88dfc1e7..66a12e33 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 @@ -375,16 +375,16 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl 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 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 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 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集合中