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 approvalList = approvalPage.getRecords(); if (CollectionUtil.isEmpty(approvalList)) { - return null; + Page> 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. 处理审批列表,拼接请假/外出详情,并收集所有需要转换的创建人账号