|
|
@@ -59,11 +59,11 @@ public class HomePageInController {
|
|
|
Criteria finalCriteria = criteria;
|
|
|
Mono<Paged<HomePageTemp>> pagedMono = template.count(query, HomePageTemp.class).flatMap(fm ->
|
|
|
template.select(Query.query(finalCriteria)
|
|
|
- .offset(request.getPageNum())
|
|
|
- .limit(request.getPageSize())
|
|
|
+ .offset(request.getPage())
|
|
|
+ .limit(request.getSize())
|
|
|
.sort(Sort.by(Sort.Order.desc("create_time"))),HomePageTemp.class)
|
|
|
.collectList()
|
|
|
- .map(list -> new Paged<>(fm, list,request.getPageNum(),request.getPageSize()))
|
|
|
+ .map(list -> new Paged<>(fm, list,request.getPage(),request.getSize()))
|
|
|
);
|
|
|
return RStatus.successList(pagedMono);
|
|
|
}
|
|
|
@@ -81,11 +81,11 @@ public class HomePageInController {
|
|
|
Criteria finalCriteria = criteria;
|
|
|
Mono<Paged<HomePageTempItem>> pagedMono = template.count(query, HomePageTempItem.class).flatMap(fm ->
|
|
|
template.select(Query.query(finalCriteria)
|
|
|
- .offset(request.getPageNum())
|
|
|
- .limit(request.getPageSize())
|
|
|
+ .offset(request.getPage())
|
|
|
+ .limit(request.getSize())
|
|
|
.sort(Sort.by(Sort.Order.desc("create_time"))),HomePageTempItem.class)
|
|
|
.collectList()
|
|
|
- .map(list -> new Paged<>(fm, list,request.getPageNum(),request.getPageSize()))
|
|
|
+ .map(list -> new Paged<>(fm, list,request.getPage(),request.getSize()))
|
|
|
);
|
|
|
return RStatus.successList(pagedMono);
|
|
|
}
|