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 getAdvancedSearchClause(Map parameterMap) { List lawsHomeAdvancedSearchClauseVOList = new ArrayList<>(); List> data = documentSplitService.queryDocumentSplitDetailByList(parameterMap); + // 过滤已发布数据 + List infoIdList = data.stream().map(v -> String.valueOf(v.get("info_id"))) + .distinct().collect(Collectors.toList()); + List list = sarFileSplitInfoService.list(new LambdaQueryWrapper() + .in(SarFileSplitInfoEO::getId, infoIdList).isNull(SarFileSplitInfoEO::getPublishBeforeId)); + List idList = list.stream().map(v -> v.getId()).collect(Collectors.toList()); // 根据info_id分组 if (!data.isEmpty()){ Map>> 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)){