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

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml

@@ -54,7 +54,7 @@
             FROM
                 esua_epdc_user.epdc_user uu
             LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
-            AND ad.type_key = 'grid_party'
+            AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
             LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
             LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
             WHERE
@@ -65,9 +65,11 @@
                         #{deptId}
                     </foreach>
                 </if>
+            AND ad2.id is NOT NULL
             AND ad.id IS NOT NULL
-            AND ad2.id IS NOT NULL
+            AND ad1.id IS NOT NULL
             AND ad.DEL_FLAG = '0'
+            AND ad1.DEL_FLAG = '0'
             AND ad2.DEL_FLAG = '0'
             GROUP BY
                 ad2.id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -28,7 +28,7 @@
                     ad2.`name` streetName, ad2.id streetId
                 FROM
                     esua_epdc_user.epdc_user uu
-                    LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+                    LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
                     <include refid="joinCommunityStreet"></include>
                 WHERE uu.DEL_FLAG = '0'
                     <if test='partyFlag != null and partyFlag == "1"'>AND uu.PARTY_FLAG = '1'</if>
@@ -46,7 +46,9 @@
                     </if>
                     AND ad2.id is NOT NULL
                     AND ad.id IS NOT NULL
+                    AND ad1.id IS NOT NULL
                     AND ad.DEL_FLAG = '0'
+                    AND ad1.DEL_FLAG = '0'
                     AND ad2.DEL_FLAG = '0'
                 ) t GROUP BY t.streetId
             ) t1
@@ -1072,7 +1074,7 @@
         FROM
         epdc_user uu
         ) newuu
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+        LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
         <include refid="joinCommunityStreet"></include>
 
         WHERE newuu.DEL_FLAG = '0'
@@ -1090,7 +1092,9 @@
         </if>
         AND ad2.id is NOT NULL
         AND ad.id IS NOT NULL
+        AND ad1.id IS NOT NULL
         AND ad.DEL_FLAG = '0'
+        AND ad1.DEL_FLAG = '0'
         AND ad2.DEL_FLAG = '0'
 
         ) t GROUP BY t.streetId
@@ -1206,7 +1210,7 @@
         FROM
         epdc_user uu
         ) newuu
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+        LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
         <include refid="joinCommunityStreet"></include>
         where
         newuu.DEL_FLAG = '0'
@@ -1215,7 +1219,9 @@
         </if>
         AND ad2.id is NOT NULL
         AND ad.id IS NOT NULL
+        AND ad1.id IS NOT NULL
         AND ad.DEL_FLAG = '0'
+        AND ad1.DEL_FLAG = '0'
         AND ad2.DEL_FLAG = '0'
         <choose>
             <when test="gridId != null and gridId != ''">AND ad2.ID = #{gridId}</when>