From a778c268c36253c30fe20cddd9e728968b3a8a4c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 19:12:07 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/web/emis/EmisWaybillController.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 2b19078ae..0ab17d532 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -365,7 +365,8 @@ public class EmisWaybillController extends BaseController
     {
         startPage();
         if(!scanRecord.getParams().containsKey("scanStatType")){
-            return getDataTable(null);
+            return getDataTable(new ArrayList<>());
+
         }
 
 //        1-发件清单 2-到件清单 3-派件清单
@@ -378,7 +379,7 @@ public class EmisWaybillController extends BaseController
         else if("3".equals(scanStatType)){
             scanRecord.setScanType(ScanType.SENT.opCode);
         }else{
-            return getDataTable(null);
+            return getDataTable(new ArrayList<>());
         }
 
         scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());