Merge remote-tracking branch 'origin/hotfix/selectDate' into hotfix/selectDate

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>

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>