Selaa lähdekoodia

优化空结果

zhou-hao 5 vuotta sitten
vanhempi
commit
e108f31417

+ 2 - 2
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/DefaultElasticSearchService.java

@@ -78,11 +78,11 @@ public class DefaultElasticSearchService implements ElasticSearchService {
     public <T> Mono<PagerResult<T>> queryPager(String index, QueryParam queryParam, Function<Map<String, Object>, T> mapper) {
         return doSearch(createSearchRequest(queryParam, index))
             .map(response -> translatePageResult(mapper, queryParam, response))
-            .switchIfEmpty(Mono.just(PagerResult.empty()))
             .onErrorReturn(err -> {
                 log.error("query elastic error", err);
                 return true;
-            }, PagerResult.empty());
+            }, PagerResult.empty())
+            .defaultIfEmpty(PagerResult.empty());
     }
 
     @Override