From 183fa7de102bf1abed9fb0223722ed216bf83a07 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 11 May 2024 13:57:57 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisQuoteDispAreaMapper.xml | 15 +++++++++++++--
 .../resources/mapper/EmisQuoteSendAreaMapper.xml | 16 ++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
index 13872e0e6..60f426450 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
@@ -58,8 +58,19 @@
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+<!--            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>-->
+<!--            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>-->
+
+            <if test="createSite != null  and createSite != ''">
+                <!-- 包含子网点 -->
+                AND use_site_code in (
+                SELECT t1.site_code FROM (
+                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                #{createSite} ) pd
+                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                )
+            </if>
+
         </where>
         order by create_time desc
     </select>
diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
index 0fbc3bda5..8cfd8491d 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
@@ -59,8 +59,20 @@
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+<!--            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>-->
+<!--            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>-->
+
+            <if test="createSite != null  and createSite != ''">
+                <!-- 包含子网点 -->
+                AND use_site_code in (
+                SELECT t1.site_code FROM (
+                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                #{createSite} ) pd
+                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                )
+            </if>
+
+
         </where>
         order by create_time desc
     </select>