From da2c0861aa55e64146c62f95fe41c73e586d8887 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 21 Jan 2026 10:50:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 当审批列表为空时，创建并返回包含空记录的分页对象
- 设置分页参数包括总数、大小、当前页和页数
- 使用TableDataInfo构建返回结果避免空指针错误
---
 .../com/klp/service/impl/WmsApprovalServiceImpl.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java
index 05723a9b..c1a2438f 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java
@@ -89,7 +89,14 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
         List<WmsApprovalVo> approvalList = approvalPage.getRecords();
 
         if (CollectionUtil.isEmpty(approvalList)) {
-            return null;
+            Page<Map<String, Object>> emptyResultPage = new Page<>();
+            emptyResultPage.setRecords(new ArrayList<>());
+            emptyResultPage.setTotal(approvalPage.getTotal());
+            emptyResultPage.setSize(approvalPage.getSize());
+            emptyResultPage.setCurrent(approvalPage.getCurrent());
+            emptyResultPage.setPages(approvalPage.getPages());
+
+            return TableDataInfo.build(emptyResultPage);
         }
 
         // 2. 处理审批列表，拼接请假/外出详情，并收集所有需要转换的创建人账号