From db737f51241b30c7c752f949648a6ad6026181c6 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 28 May 2020 16:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E3=80=91=E3=80=90=E6=95=B0=E6=8D=AE=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9SQL=E3=80=91-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/user/MetaUserRegisterRankDao.xml  | 2 ++
 .../src/main/resources/mapper/user/UserAnalysisDao.xml      | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
index 9c986fb5f..495d8d4ab 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
@@ -67,6 +67,8 @@
                 </if>
             AND ad.id IS NOT NULL
             AND ad2.id IS NOT NULL
+            AND ad.DEL_FLAG = '0'
+            AND ad2.DEL_FLAG = '0'
             GROUP BY
                 ad2.id
     </select>
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 0ad3ad0e5..6e3096918 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -46,6 +46,8 @@
                     </if>
                     AND ad2.id is NOT NULL
                     AND ad.id IS NOT NULL
+                    AND ad.DEL_FLAG = '0'
+                    AND ad2.DEL_FLAG = '0'
                 ) t GROUP BY t.streetId
             ) t1
         <choose>
@@ -1088,6 +1090,8 @@
         </if>
         AND ad2.id is NOT NULL
         AND ad.id IS NOT NULL
+        AND ad.DEL_FLAG = '0'
+        AND ad2.DEL_FLAG = '0'
 
         ) t GROUP BY t.streetId
         ) t1
@@ -1211,6 +1215,8 @@
         </if>
         AND ad2.id is NOT NULL
         AND ad.id IS NOT NULL
+        AND ad.DEL_FLAG = '0'
+        AND ad2.DEL_FLAG = '0'
         <choose>
             <when test="gridId != null and gridId != ''">AND ad2.ID = #{gridId}</when>
             <otherwise>