From 7193c1ca70127cd88ee1c079d75b97a4bb3f080c Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 1 Jul 2024 16:51:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2):=20?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=90=9C=E7=B4=A2=E9=87=8D=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/service/impl/LawsHomeSearchServiceImpl.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index d3c351d9..c7fdda29 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -1546,11 +1546,20 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     public List<LawsHomeAdvancedSearchClauseVO> getAdvancedSearchClause(Map<String, Object> parameterMap) {
         List<LawsHomeAdvancedSearchClauseVO> lawsHomeAdvancedSearchClauseVOList = new ArrayList<>();
         List<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetailByList(parameterMap);
+        // 过滤已发布数据
+        List<String> infoIdList = data.stream().map(v -> String.valueOf(v.get("info_id")))
+                .distinct().collect(Collectors.toList());
+        List<SarFileSplitInfoEO> list = sarFileSplitInfoService.list(new LambdaQueryWrapper<SarFileSplitInfoEO>()
+                .in(SarFileSplitInfoEO::getId, infoIdList).isNull(SarFileSplitInfoEO::getPublishBeforeId));
+        List<String> idList = list.stream().map(v -> v.getId()).collect(Collectors.toList());
         // 根据info_id分组
         if (!data.isEmpty()){
             Map<String, List<Map<String, Object>>> groupMap =
                     data.stream().collect(Collectors.groupingBy(v -> String.valueOf(v.get("info_id"))));
             groupMap.forEach((k, v) -> {
+                if (!idList.contains(k)){
+                    return;
+                }
                 // 封装数据
                 SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoService.queryById(k);
                 if (!Objects.isNull(sarFileSplitInfoEO)){