From ec743f5a12f6da52bee954f23d68a7d56a8cfddf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 1 Sep 2024 23:52:24 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 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 6b9ab4c82..49945c3dd 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
@@ -615,6 +615,7 @@ public class EmisWaybillController extends EmisBaseController
     }
 
 
+    @Log(title = "APP获取运单数据", businessType = BusinessType.OTHER)
     @JacksonFilter(include= {
             "id","orderSn","billCode","orderStatus","waybillStatus",
             "orderType","sendDate","customerCode","customerName",
@@ -641,14 +642,7 @@ public class EmisWaybillController extends EmisBaseController
         // 设置通用权限查询参数
         setPrivParams(emisWaybill);
 
-        // 如果不带查询本人开单的数据
-        if(StringUtils.isEmpty(emisWaybill.getBillCode())){
-            try {
-                emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
-            }catch(Exception ex){
-                ex.printStackTrace();
-            }
-        }
+
 
         List<EmisWaybill> list = null;
         // 如果单号不为空，则去除其他参数
@@ -668,6 +662,16 @@ public class EmisWaybillController extends EmisBaseController
                 // 获取未接单数据
                 list = emisWaybillService.selectWaitGotOrderList(emisWaybill);
             }else{
+
+                // 如果不带查询本人开单的数据
+                if(StringUtils.isEmpty(emisWaybill.getBillCode())){
+                    try {
+                        emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
+                    }catch(Exception ex){
+                        ex.printStackTrace();
+                    }
+                }
+
                 // 设置通用权限查询参数
                 list = emisWaybillService.selectEmisWaybillList(emisWaybill);
             }