clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

order/master/app/list分页问题修复

This commit is contained in:
donqi 2022-07-26 14:03:12 +08:00
parent e4f894a52b
commit 7cc761d7d5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -88,7 +88,7 @@ public class OrderMasterController extends BaseController {
@PostMapping("/app/list") @PostMapping("/app/list")
@ResponseBody @ResponseBody
public TableDataInfo appList(@RequestBody OrderMaster orderMaster) { public TableDataInfo appList(@RequestBody OrderMaster orderMaster) {
TableDataInfo rspData = new TableDataInfo(); // TableDataInfo rspData = new TableDataInfo();
startPage(); startPage();
List<OrderListResponse> orderListResponses = new ArrayList<>(); List<OrderListResponse> orderListResponses = new ArrayList<>();
List<OrderMaster> list = orderMasterService.selectOrderMasterList(orderMaster); List<OrderMaster> list = orderMasterService.selectOrderMasterList(orderMaster);
@ -150,19 +150,19 @@ public class OrderMasterController extends BaseController {
}); });
PageDomain pageDomain = TableSupport.buildPageRequest(); // PageDomain pageDomain = TableSupport.buildPageRequest();
if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) { // if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) {
rspData.setRows(orderListResponses); // rspData.setRows(orderListResponses);
rspData.setTotal(orderListResponses.size()); // rspData.setTotal(orderListResponses.size());
return rspData; // return rspData;
} // }
Integer pageSize = pageDomain.getPageNum(); // Integer pageSize = pageDomain.getPageNum();
if (pageSize > orderListResponses.size()) { // if (pageSize > orderListResponses.size()) {
pageSize = orderListResponses.size(); // pageSize = orderListResponses.size();
} // }
rspData.setRows(orderListResponses.subList(0, pageSize)); // rspData.setRows(orderListResponses.subList(0, pageSize));
rspData.setTotal(orderListResponses.size()); // rspData.setTotal(orderListResponses.size());
return rspData; return voDataTable(orderListResponses, list);
} }
@PostMapping("/app/detail") @PostMapping("/app/detail")