From 87dae51a15e9c779a6c826053b56f5a0c7af07a2 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Wed, 2 Sep 2026 19:31:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(bms):=20=E5=8F=91=E7=A5=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=85=BC=E5=AE=B9pageNum/pageNo=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=BF=BB=E9=A1=B5=E5=A7=8B?=
 =?UTF-8?q?=E7=BB=88=E8=BF=94=E5=9B=9E=E7=AC=AC=E4=B8=80=E9=A1=B5=EF=BC=9B?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A1=A5id=E5=85=9C=E5=BA=95=E9=98=B2?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mhd/bms/interfaces/facadeApi/BmsInvoiceListApi.java    | 7 +++++--
 mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

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<IPage<BmsInvoiceListVO>> 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<IPage<BmsInvoiceListVO>> result = new Result<IPage<BmsInvoiceListVO>>();
-        Page<BmsInvoiceListVO> pageList = new Page<BmsInvoiceListVO>(pageNo,pageSize);
+        Page<BmsInvoiceListVO> pageList = new Page<BmsInvoiceListVO>(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
         <include refid="common_where"></include>
         group by a.id
-        order by a.create_time desc
+        order by a.create_time desc, a.id desc
     </select>
     <select id="getById" parameterType="java.lang.String" resultType="com.mhd.bms.domain.bmsInvoiceList.repository.vo.BmsInvoiceListDetailsVO">
         select