From 985c287136ef7589a5adfeb0f4f41f405b6b2dee Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 14 May 2024 02:15:37 +0800 Subject: [PATCH] md --- README | 18 ++++++++++++++++++ .../mapper/EmisCustomerUserMapper.xml | 10 +++++++--- .../mapper/EmisQuoteDispAreaMapper.xml | 11 +++++++---- .../resources/mapper/EmisQuotePriceMapper.xml | 11 +++++++---- .../mapper/EmisQuoteSendAreaMapper.xml | 11 +++++++---- 5 files changed, 46 insertions(+), 15 deletions(-) create mode 100644 README diff --git a/README b/README new file mode 100644 index 000000000..38f1bd097 --- /dev/null +++ b/README @@ -0,0 +1,18 @@ + SELECT t3.site_code FROM( + SELECT t1.site_code,t1.parent_site_code,t1.site_name, + IF( FIND_IN_SET( parent_site_code, @parent_ids ) > 0, @parent_ids := CONCAT( @parent_ids, ',', site_code ), '0' ) AS cids + FROM ( SELECT * FROM emis_site AS t WHERE t.del_flag = '0' ORDER BY t.site_code ASC ) t1, + ( SELECT @parent_ids := #{ownerSite} ) t2 + ) t3 + WHERE cids != '0' + UNION + SELECT #{ownerSite} FROM dual + + + + 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 \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index 902d35e2c..5a8dfe50a 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -161,9 +161,13 @@ 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 t3.site_code FROM( + SELECT t1.site_code,t1.parent_site_code,t1.site_name, + IF( FIND_IN_SET( parent_site_code, @parent_ids ) > 0, @parent_ids := CONCAT( @parent_ids, ',', site_code ), '0' ) AS cids + FROM ( SELECT * FROM emis_site AS t WHERE t.del_flag = '0' ORDER BY t.site_code ASC ) t1, + ( SELECT @parent_ids := #{ownerSite} ) t2 + ) t3 + WHERE cids != '0' UNION SELECT #{ownerSite} FROM dual ) diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml index fb63c30a2..bbe56a4f1 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml @@ -64,10 +64,13 @@ 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 t3.site_code FROM( + SELECT t1.site_code,t1.parent_site_code,t1.site_name, + IF( FIND_IN_SET( parent_site_code, @parent_ids ) > 0, @parent_ids := CONCAT( @parent_ids, ',', site_code ), '0' ) AS cids + FROM ( SELECT * FROM emis_site AS t WHERE t.del_flag = '0' ORDER BY t.site_code ASC ) t1, + ( SELECT @parent_ids := #{createSite} ) t2 + ) t3 + WHERE cids != '0' UNION SELECT #{createSite} FROM dual ) diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml index 661ffc7e4..09fed3cd0 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml @@ -149,10 +149,13 @@ AND use_site_code in ( - SELECT t1.site_code FROM ( - 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) + SELECT t3.site_code FROM( + SELECT t1.site_code,t1.parent_site_code,t1.site_name, + IF( FIND_IN_SET( parent_site_code, @parent_ids ) > 0, @parent_ids := CONCAT( @parent_ids, ',', site_code ), '0' ) AS cids + FROM ( SELECT * FROM emis_site AS t WHERE t.del_flag = '0' ORDER BY t.site_code ASC ) t1, + ( SELECT @parent_ids := #{useSiteCode} ) t2 + ) t3 + WHERE cids != '0' UNION SELECT #{useSiteCode} FROM dual ) diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml index c78f71e67..da70f0dda 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml @@ -65,10 +65,13 @@ 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 t3.site_code FROM( + SELECT t1.site_code,t1.parent_site_code,t1.site_name, + IF( FIND_IN_SET( parent_site_code, @parent_ids ) > 0, @parent_ids := CONCAT( @parent_ids, ',', site_code ), '0' ) AS cids + FROM ( SELECT * FROM emis_site AS t WHERE t.del_flag = '0' ORDER BY t.site_code ASC ) t1, + ( SELECT @parent_ids := #{createSite} ) t2 + ) t3 + WHERE cids != '0' UNION SELECT #{createSite} FROM dual )