From 58b45430009d10622baad0560ee90dc49a6ae72e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 31 May 2024 04:30:48 +0800
Subject: [PATCH] md

---
 .../main/resources/mapper/EmisQuotePriceMapper.xml  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index b31db3431..7b4ce254e 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -101,6 +101,8 @@
         select quote_id, quote_code, quote_name, quote_type, customer_code, cust_no, use_site_code, trans_line_code, fee_type, prod_code, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price
     </sql>
 
+<!--    and FIND_IN_SET(quote_type,#{quoteType})-->
+
 
     <select id="selectEmisQuotePriceList" parameterType="EmisQuotePrice" resultMap="EmisQuotePriceResult">
         <include refid="selectEmisQuotePriceVo"/>
@@ -112,9 +114,14 @@
             <if test="quoteCode != null  and quoteCode != ''"> and quote_code=#{quoteCode}</if>
             <if test="transLineCode != null  and transLineCode != ''"> and trans_line_code=#{transLineCode}</if>
 
-            <if test="quoteType != null  and quoteType != ''"> and FIND_IN_SET(quote_type,#{quoteType})</if>
-            <if test="customerCode != null  and customerCode != ''"> and customer_code=#{customerCode}</if>
-            <if test="custNo != null  and custNo != ''"> and cust_no=#{custNo}</if>
+
+            <if test="quoteType != null  and (quoteType == '3' or quoteType == '4' or quoteType == '3,4')">
+                and ( ( cust_no is not null and cust_no=#{custNo} ) or ( customer_code is not null and customer_code=#{customerCode}  ) )
+            </if>
+
+            <if test="quoteType != null  and (quoteType == '1' or quoteType == '2' or quoteType == '1,2')">
+                and  cust_no is not null and customer_code is not null
+            </if>
 
             <if test="feeType != null  and feeType != ''"> and fee_type=#{feeType}</if>
             <if test="prodCode != null  and prodCode != ''"> and  FIND_IN_SET(#{prodCode}, prod_code)</if>