Merge remote-tracking branch 'origin/master'

feige

2024-10-18 98cd4713254614381ede8fa42d0820a3ffc1d53e

 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;

    }