diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 1cd189207..5b7c8b8c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -106,6 +106,9 @@ public class WxBillAllController extends BillBaseController { } } PageInfo merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); + PageInfo page = new PageInfo(); + page.setPageNum(pageNum); + page.setPageSize(pageSize); if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { List retList = new ArrayList(); for (int i = 0 ; i < merchantPage.getList().size(); i ++) { @@ -140,11 +143,15 @@ public class WxBillAllController extends BillBaseController { retList.add(vo); } - PageHelper.startPage(pageNum, pageSize); - return new PageInfo(retList); + page.setPages(merchantPage.getPages()); + page.setTotal(merchantPage.getTotal()); + page.setList(retList); + return page; + }else { + page.setPages(1); + page.setTotal(0); } - PageHelper.startPage(pageNum, pageSize); - return new PageInfo(new ArrayList()); + return page; } /**