From 3ee06bd46c3809fdd00e509debd97dcd039ed031 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 21:00:11 +0800
Subject: [PATCH] 修改家谱中会显示超出范围的数据&家族模块的导出
---
zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 6fcfd37..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
@@ -121,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