From 2f300b099a143477082104f86abd9315e20b0b08 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 15 Jul 2024 21:06:37 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/oms/web/Oms2cWaybillController.java     | 7 +++----
 .../src/main/resources/mapper/EmisWaybillMapper.xml        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index 439ace1..00b8cbc 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -82,8 +82,8 @@ public class Oms2cWaybillController extends BaseController
     @Log(title = "OMSExcel草稿方式下单", businessType = BusinessType.INSERT)
     @PostMapping(value = "/draftSubmitOrder")
     public AjaxResult draftSubmitOrder(@RequestBody EmisWaybill emisWaybillSave){
-        waybillOrder.setUserId(getLoginUser().getUser().getId());
-        waybillOrder.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+        emisWaybillSave.setUserId(getLoginUser().getUser().getId());
+        emisWaybillSave.setCustomerCode(getLoginUser().getUser().getCustomerCode());
         return this.iRpcWaybillSvc.draftSubmitOrderByOms(emisWaybillSave);
     }
 
@@ -99,8 +99,7 @@ public class Oms2cWaybillController extends BaseController
         return this.iRpcWaybillSvc.preCalcWaybillFeeByOms(waybillOrder);
     }
 
-
-    @RequestMapping("/list")
+    @GetMapping("/list")
     public TableDataInfo list(EmisWaybill emisWaybill)
     {
         startPage();
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 5600912..8b418a0 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -459,7 +459,7 @@
             <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>
 
 
-            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userId != null "> and a.user_id = #{userId}</if>
 
              and customer_code=#{customerCode}