|
@@ -94,12 +94,12 @@ public class OrderBaseEsLogic {
|
|
.withQuery(queryBuilder)
|
|
.withQuery(queryBuilder)
|
|
.withQuery(queryBuilder1)
|
|
.withQuery(queryBuilder1)
|
|
.withSort(SortBuilders.fieldSort("create_time").order(SortOrder.DESC))
|
|
.withSort(SortBuilders.fieldSort("create_time").order(SortOrder.DESC))
|
|
- .withPageable(PageRequest.of(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()))
|
|
|
|
|
|
+ .withPageable(PageRequest.of(zfireParamBean.getPageNum() -1, zfireParamBean.getPageSize()))
|
|
.build();
|
|
.build();
|
|
|
|
|
|
|
|
|
|
SearchHits<OrderBaseEs> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBaseEs.class);
|
|
SearchHits<OrderBaseEs> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBaseEs.class);
|
|
- SearchPage<OrderBaseEs> searchHits = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
|
|
|
|
|
|
+ SearchPage<OrderBaseEs> searchHits = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, PageRequest.of(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()));
|
|
|
|
|
|
|
|
|
|
List<OrderBaseEs> orderBaseEs = new ArrayList<>();
|
|
List<OrderBaseEs> orderBaseEs = new ArrayList<>();
|