From ee41cdb454ad1083f5144a7a30056f0dbd6988f9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 15 Jan 2025 17:09:14 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cWaybillController.java   |  6 ++++++
 .../resources/mapper/EmisWaybillMapper.xml    | 21 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 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 0944656..21ccb95 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
@@ -234,6 +234,12 @@ public class Oms2cWaybillController extends BaseController
         emisWaybill.getParams().put("isSapp","1");
         // 用户只能获取自己的单子
         emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+
+        // bug:1361 EMIS - 运单号的寄件手机号与小程序的手机号一致全部给小程序对应的手机号
+        // 获取当前登录人的手机号,如果电话一致就把订单归属给他
+        emisWaybill.getParams().put("queryPhone",getLoginUser().getUser().getPhone());
+
+
         List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);
         return getDataTable(list);
     }
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 3e3fc4f..fd8c11c 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -373,11 +373,11 @@
             <if test="params.isSapp !=null and params.isSapp == 1">
                 <if test="billCode != null  and billCode != ''">
                  and (
-                        bill_code like concat('%', #{billCode}, '%')
-                        or send_name like concat('%', #{billCode}, '%')
-                        or receive_name like concat('%', #{billCode}, '%')
-                        or receive_mobile like concat('%', #{billCode}, '%')
-                        or send_mobile like concat('%', #{billCode}, '%')
+                    a.bill_code like concat('%', #{billCode}, '%')
+                        or a.send_name like concat('%', #{billCode}, '%')
+                        or a.receive_name like concat('%', #{billCode}, '%')
+                        or a.receive_mobile like concat('%', #{billCode}, '%')
+                        or a.send_mobile like concat('%', #{billCode}, '%')
                     )
                 </if>
             </if>
@@ -542,15 +542,20 @@
 
             <!-- 寄件 -->
             <if test="params.omsOrderTab == null or (params.omsOrderTab != null and params.omsOrderTab != 2) ">
-                and a.customer_code=#{customerCode}
+                and (
+                    a.customer_code=#{customerCode}
+                    <if test="params.queryPhone != null and params.queryPhone != '' ">
+                        or a.send_mobile=#{params.queryPhone}
+                    </if>
+                )
             </if>
 
             <!-- 收件 -->
             <if test="params.omsOrderTab != null and params.omsOrderTab == 2 ">
-                and exists (select 1 from emis_customer_user ecu where a.del_flag='0' and a.receive_mobile=ecu.phone  and ecu.customer_code=#{customerCode} )
+                a.receive_mobile=#{params.queryPhone}
             </if>
 
-            <!-- 待付款 -->
+        <!-- 待付款 -->
             <if test="params.omsOrderTab != null and params.omsOrderTab == 3 ">
                 and a.payment_status='0'
             </if>