From 485aec3f31fc5c7da6bc85c9cc17122595a250c1 Mon Sep 17 00:00:00 2001 From: macro Date: Fri, 14 Oct 2022 19:01:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/search/service/impl/EsProductServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java b/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java index e4f548c..a487c8b 100644 --- a/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java +++ b/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java @@ -1,5 +1,6 @@ package com.macro.mall.search.service.impl; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.macro.mall.search.dao.EsProductDao; import com.macro.mall.search.domain.EsProduct; @@ -162,7 +163,7 @@ public class EsProductServiceImpl implements EsProductService { LOGGER.info("DSL:{}", searchQuery.getQuery().toString()); SearchHits searchHits = elasticsearchRestTemplate.search(searchQuery, EsProduct.class); if(searchHits.getTotalHits()<=0){ - return new PageImpl<>(null,pageable,0); + return new PageImpl<>(ListUtil.empty(),pageable,0); } List searchProductList = searchHits.stream().map(SearchHit::getContent).collect(Collectors.toList()); return new PageImpl<>(searchProductList,pageable,searchHits.getTotalHits()); @@ -206,12 +207,12 @@ public class EsProductServiceImpl implements EsProductService { LOGGER.info("DSL:{}", searchQuery.getQuery().toString()); SearchHits searchHits = elasticsearchRestTemplate.search(searchQuery, EsProduct.class); if(searchHits.getTotalHits()<=0){ - return new PageImpl<>(null,pageable,0); + return new PageImpl<>(ListUtil.empty(),pageable,0); } List searchProductList = searchHits.stream().map(SearchHit::getContent).collect(Collectors.toList()); return new PageImpl<>(searchProductList,pageable,searchHits.getTotalHits()); } - return new PageImpl<>(null); + return new PageImpl<>(ListUtil.empty()); } @Override