分析模块调整

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

@@ -43,7 +43,7 @@ FROM (
 				<if test="formDto.deptId != null and formDto.deptId !=''">
 					AND (ad2.id = #{formDto.deptId} or ad.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} )
 				</if>
-                AND ad2.id IN
+                AND ad.id IN
                 <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
                     #{deptIdItem}
         		</foreach>

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

@@ -190,6 +190,7 @@
         LEFT JOIN esua_epdc_admin.sys_dept ad ON u.DEPT_ID = ad.ID
         AND ad.type_key = 'grid_party'
         LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
+        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
         u.DEL_FLAG = '0'
         <if test="deptIdList != null and deptIdList.size() > 0">
@@ -252,8 +253,9 @@
         LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
         uu.DEL_FLAG = '0'
+        AND ad.id IS NOT NULL
         <if test="deptIdList != null and deptIdList.size() > 0">
-            and ad2.ID in
+            and ad.ID in
             <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
                 #{deptIdItem}
             </foreach>

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

@@ -43,7 +43,7 @@ FROM (
 				<if test="formDto.deptId != null and formDto.deptId !=''">
 					AND (ad2.id = #{formDto.deptId} or ad.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} )
 				</if>
-				AND ad2.id IN
+				AND ad.id IN
 				<foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
 					#{deptIdItem}
 				</foreach>