From f33f3d3ab4f43745e0ab077be39907ab2bd8520c Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 9 Mar 2026 15:49:43 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20tms-oa=E6=8E=A5=E5=8F=A3-?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E5=87=BA=E8=B4=A7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 8c4f45f78..b6df2f5ad 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2928,7 +2928,16 @@
             <if test="paymentType != null  and paymentType != ''"> and FIND_IN_SET(payment_type,#{paymentType})</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
             <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
-            <if test="custName != null  and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
+            <if test="custName != null  and custName != ''">
+                <choose><when test="customerType != null and customerType != '' and
+                     customerType == 1">
+                    and mu.company like concat('%', #{custName}, '%')
+                </when>
+                    <otherwise>
+                        and cust_name like concat('%', #{custName}, '%')
+                    </otherwise>
+                </choose>
+            </if>
             <if test="transLineType != null  and transLineType != ''"> and trans_line_type=#{transLineType}</if>
             <if test="productType != null  and productType != ''"> and FIND_IN_SET(product_type,#{productType})</if>
             <if test="timeType != null  and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>