From 4f9d6cbd464e2c13d8726f03dc9870b67dab774e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 1 Jul 2024 18:27:02 +0800
Subject: [PATCH] md

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

diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 24b97230f..920b0ea82 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -51,7 +51,7 @@
 
 
     <sql id="selectEmisQuotePriceVo">
-        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
+        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 a
     </sql>
 
 <!--    and FIND_IN_SET(quote_type,#{quoteType})-->
@@ -91,7 +91,10 @@
             <if test="dispAreaSite != null  and dispAreaSite != ''"> and disp_area_site like concat('%', #{dispAreaSite}, '%')</if>
 
             <if test="dispAreaSiteCode != null  and dispAreaSiteCode != ''">
-                and ( find_in_set(#{dispAreaSiteCode},disp_area_site_code) or disp_area_site_code='-1' )
+                and (
+                    exists (select 1 from emis_quote_disp_area eqda where a.disp_area_id=eqda.area_id and find_in_set(#{dispAreaSiteCode},eqda.area_site_code) )
+                    or disp_area_site_code='-1'
+                )
             </if>
 
             <if test="dispAreaSiteId != null  and dispAreaSiteId != ''"> and disp_area_site_id=#{dispAreaSiteId}</if>
@@ -100,7 +103,10 @@
             <if test="sendAreaName != null  and sendAreaName != ''"> and send_area_name like concat('%', #{sendAreaName}, '%')</if>
             <if test="sendAreaSite != null  and sendAreaSite != ''"> and send_area_site like concat('%', #{sendAreaSite}, '%')</if>
 
-            <if test="sendAreaSiteCode != null  and sendAreaSiteCode != ''"> and ( find_in_set(#{sendAreaSiteCode},send_area_site_code) or send_area_site_code='-1')</if>
+            <if test="sendAreaSiteCode != null  and sendAreaSiteCode != ''"> and (
+                exists (select 1 from emis_quote_send_area eqsa where a.send_area_id=eqsa.area_id and find_in_set(#{sendAreaSiteCode},eqsa.area_site_code) )
+                or send_area_site_code='-1'
+             )</if>
 
             <if test="sendAreaSiteId != null  and sendAreaSiteId != ''"> and send_area_site_id like concat('%', #{sendAreaSiteId}, '%')</if>
             <if test="carriesNumber != null  and carriesNumber != ''"> and carries_number like concat('%', #{carriesNumber}, '%')</if>