From 904cd732d765ec76297e7fa8a073bcfaf0eea04a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 7 Jun 2024 15:45:47 +0800
Subject: [PATCH] md

---
 .../main/resources/mapper/EmisWaybillMapper.xml   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 1059d3020..9b1b831b8 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -360,8 +360,8 @@
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>
-            del_flag='0'
-            <if test="id != null "> and id = #{id}</if>
+            a.del_flag='0'
+            <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
 
@@ -509,11 +509,12 @@
             <if test="paymentDate != null "> and payment_date = #{paymentDate}</if>
             <if test="paymentRemark != null  and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
             <if test="orderRemark != null  and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="createBy != null  and createBy != ''"> and create_by= #{createBy}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by=#{updateBy}</if>
-            <if test="createSite != null  and createSite != ''"> and create_site=#{createSite}</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site=#{updateSite}</if>
+
+            <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and a.create_by= #{createBy}</if>
+            <if test="updateBy != null  and updateBy != ''"> and a.update_by=#{updateBy}</if>
+            <if test="createSite != null  and createSite != ''"> and a.create_site=#{createSite}</if>
+            <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>