From 4d99846dcd82ffb0f1a207240b7609a224e8e84e Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 21 十月 2025 14:58:59 +0800
Subject: [PATCH] 修改了一个bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
index 87b37e2..7ed3c3b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java
@@ -76,7 +76,6 @@
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
-// boolQueryBuilder.filter(QueryBuilders.termsQuery("fid", idList));
boolQueryBuilder.should(QueryBuilders.matchQuery("ctName",con));
boolQueryBuilder.should(QueryBuilders.matchQuery("ctContent",con));
boolQueryBuilder.should(QueryBuilders.matchQuery("remark",con));
@@ -101,7 +100,9 @@
});
// articleList.forEach(a-> System.out.println(a))
- return esm;
+ return esm.stream().filter(esModel -> {
+ return idList.contains(esModel.getFid());
+ }).collect(Collectors.toList());
}
@@ -120,7 +121,11 @@
.withQuery(boolQueryBuilder);
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
- return Objects.requireNonNull(elasticsearchRestTemplate.searchOne(nativeSearchQuery, EsModel.class)).getContent();
+ SearchHit<EsModel> esModelSearchHit = elasticsearchRestTemplate.searchOne(nativeSearchQuery, EsModel.class);
+ if(esModelSearchHit != null){
+ return esModelSearchHit.getContent();
+ }
+ return null;
}
--
Gitblit v1.9.1