diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BmsInvoiceListApi.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BmsInvoiceListApi.java index cb4f790b5..9bee593e5 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BmsInvoiceListApi.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BmsInvoiceListApi.java @@ -52,11 +52,14 @@ public class BmsInvoiceListApi extends BaseController { @ApiOperation(value = "销项发票表-分页列表查询", notes = "销项发票表-分页列表查询") @RequestMapping(value = "/queryList") public Result> queryList(BmsInvoiceListQueryDTO bmsInvoiceListQueryDTO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageNo", required=false) Integer pageNo, + @RequestParam(name="pageNum", required=false) Integer pageNum, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + // 前端分页参数名不统一(pageNum / pageNo),两个都兼容,优先 pageNo + int currentPage = pageNo != null ? pageNo : (pageNum != null ? pageNum : 1); Result> result = new Result>(); - Page pageList = new Page(pageNo,pageSize); + Page pageList = new Page(currentPage,pageSize); pageList = bmsInvoiceListService.queryList(pageList, bmsInvoiceListQueryDTO); result.setResult(pageList); result.setSuccess(true); diff --git a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml index 4f2eb2a0a..6cd8a897f 100644 --- a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml @@ -10,7 +10,7 @@ where a.is_delete = 0 group by a.id - order by a.create_time desc + order by a.create_time desc, a.id desc