diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 25fe3d5cfe..560917fe4d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -60,7 +60,7 @@
             del_flag = '0'
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
-                AND org_id = #{orgId}
+                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
             </if>
             <if test="orgType == 'grid'">
                 AND grid_id = #{orgId}
@@ -76,7 +76,6 @@
             org_id AS "agencyId",
             org_name AS "agencyName",
             grid_id AS "gridId",
-            grid_name AS "gridName",
             user_id AS "userId",
             user_name AS "userName",
             round(index_score, 1) AS "indexScore"
@@ -87,7 +86,7 @@
         AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
-                AND org_id = #{orgId}
+                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
             </if>
             <if test="orgType == 'grid'">
                 AND grid_id = #{orgId}