From e11edb4bc554f714bd2c74bc20f4db1d4b636a5d Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 8 Nov 2023 16:37:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=2078?=
 =?UTF-8?q?337?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarFileSplitInfoServiceImpl.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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<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");