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 493d7f3ad..b050c5651 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
@@ -505,14 +505,13 @@ public class EmisWaybillController extends EmisBaseController
         List<EmisWaybill> list = null;
         // 如果单号不为空，则去除其他参数
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
-            EmisWaybill queryEmisWaybill =new EmisWaybill();
-            queryEmisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
+            emisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
             String[] billCodeSortList = emisWaybill.getBillCode().split(",");
             if(billCodeSortList.length>1){
 //                queryEmisWaybill.setParams(null);
-                queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
             }
-            list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill);
+            list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         }else{
             // 设置通用权限查询参数
             list = emisWaybillService.selectEmisWaybillList(emisWaybill);
@@ -532,25 +531,31 @@ public class EmisWaybillController extends EmisBaseController
 
         startPage();
 
+
         setPrivParams(emisWaybill);
 
+        List<EmisWaybill> list = null;
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
             emisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
             String[] billCodeSortList = emisWaybill.getBillCode().split(",");
             if(billCodeSortList.length>1){
-                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+                queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
             }
+            list = emisWaybillService.selectOrderList(emisWaybill);
+
+        }else{
+            setPrivParams(emisWaybill);
+            list = emisWaybillService.selectOrderList(emisWaybill);
         }
 
-        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
-            emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn()));
-            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
-            if(orderSnSortList.length>1){
-                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
-            }
-        }
+//        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
+//            emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn()));
+//            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
+//            if(orderSnSortList.length>1){
+//                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
+//            }
+//        }
 
-        List<EmisWaybill> list = emisWaybillService.selectOrderList(emisWaybill);
         return getDataTable(list);
     }
 
@@ -662,9 +667,8 @@ public class EmisWaybillController extends EmisBaseController
 
             EmisWaybill queryEmisWaybill =new EmisWaybill();
             queryEmisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
-            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
+            String[] billCodeSortList = queryEmisWaybill.getBillCode().split(",");
             if(billCodeSortList.length>1){
-//                queryEmisWaybill.setParams(null);
                 queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
             }
             list = emisWaybillService.selectEmisWaybillList(queryEmisWaybill);