|
@@ -123,7 +123,10 @@ public class GatekeeperOrderService {
|
|
|
List<GatekeeperOrderResp> filterResult = filter(gatekeeperOrderPageResult);
|
|
List<GatekeeperOrderResp> filterResult = filter(gatekeeperOrderPageResult);
|
|
|
//排序
|
|
//排序
|
|
|
sort(param, filterResult);
|
|
sort(param, filterResult);
|
|
|
- return PageDataResult.success(param.getPageNum(), param.getPageSize(), pageByStatus.getTotal(), filterResult);
|
|
|
|
|
|
|
+ List<List<GatekeeperOrderResp>> pageList = Lists.partition(gatekeeperOrderPageResult, param.getPageSize());
|
|
|
|
|
+ List<GatekeeperOrderResp> walletPageList = pageList.size() >= param.getPageNum() ?
|
|
|
|
|
+ pageList.get(param.getPageNum() - 1) : Collections.emptyList();
|
|
|
|
|
+ return PageDataResult.success(param.getPageNum(), param.getPageSize(), (long) walletPageList.size(), gatekeeperOrderPageResult);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|