From 391c7ad496ba02de78e804d8292d01b9bc700c3a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 13 May 2024 06:57:34 +0800
Subject: [PATCH] md

---
 .../main/resources/mapper/EmisCustomerUserMapper.xml   | 10 ++++++----
 .../main/resources/mapper/EmisQuoteDispAreaMapper.xml  | 10 ++++++----
 .../src/main/resources/mapper/EmisQuotePriceMapper.xml |  2 ++
 .../main/resources/mapper/EmisQuoteSendAreaMapper.xml  | 10 ++++++----
 emis-biz/src/main/resources/mapper/EmisSiteMapper.xml  |  2 ++
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index 29dcb6fc0..7607c212a 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -162,10 +162,12 @@
             <if test="ownerSite != null  and ownerSite != ''">
                 <!-- 包含子网点 -->
                 AND owner_site in (
-                SELECT t1.site_code FROM (
-                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                #{ownerSite} ) pd
-                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                    SELECT t1.site_code FROM (
+                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                    #{ownerSite} ) pd
+                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                    UNION
+                    SELECT #{ownerSite} FROM dual
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
index 60f426450..fb63c30a2 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
@@ -64,10 +64,12 @@
             <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)
+                    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)
+                    UNION
+                    SELECT #{createSite} FROM dual
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 6cfc05774..661ffc7e4 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -153,6 +153,8 @@
                     SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
                     #{useSiteCode} ) pd
                     WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                    UNION
+                    SELECT #{useSiteCode} FROM dual
                 )
              </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
index 8cfd8491d..c78f71e67 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
@@ -65,10 +65,12 @@
             <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)
+                    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)
+                    UNION
+                    SELECT #{createSite} FROM dual
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index 9e313fd0d..e4339bba7 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -307,6 +307,8 @@
                             SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
                             #{parentSiteCode} ) pd
                             WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                            UNION
+                            SELECT #{parentSiteCode} FROM dual
                         )
                     </when>
                     <otherwise>