Merge remote-tracking branch 'origin/dev_analysis' into dev_analysis

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

@@ -40,8 +40,9 @@ FROM (
 				uu.DEL_FLAG = '0'
 				AND uu.PARTY_FLAG = '1'
 				AND ad.id IS NOT NULL
-				AND ad2.id != 1191534129122230274
+				<if test="formDto.deptId != null and formDto.deptId !=''">
 					AND ad2.id = #{formDto.deptId}
+				</if>
                 AND ad2.id IN
                 <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
                     #{deptIdItem}

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

@@ -40,8 +40,9 @@ FROM (
 				uu.DEL_FLAG = '0'
 				AND uu.PARTY_FLAG = '1'
 				AND ad.id IS NOT NULL
-				AND ad2.id != 1191534129122230274
+				<if test="formDto.deptId != null and formDto.deptId !=''">
 					AND ad2.id = #{formDto.deptId}
+				</if>
 				AND ad2.id IN
 				<foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
 					#{deptIdItem}