diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
index 51a7a49ff6..4b31a1e02a 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -42,7 +42,6 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     private ScreenCpcBaseDataDao screenCpcBaseDataDao;
     @Autowired
     private ScreenPartyBranchDataDao screenPartyBranchDataDao;
-    private List<String> issueGroup;
 
     /**
      * @Description 1、党员基本情况-饼状图概况
@@ -59,6 +58,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
         PartymemberPercentResultDTO result = screenUserTotalDataDao.selectAgencyPartymemberPercent(param.getAgencyId());
         if(null == result){
             logger.warn("com.epmet.datareport.service.screen.impl.GrassrootsPartyDevServiceImpl.partymemberBaseInfo:未查询出指定agencyId下的党员基础信息数据，agencyId :: {}",param.getAgencyId());
+            result = new PartymemberPercentResultDTO();
             result.setPercentInPlatForm(convertPercentStr(BigDecimal.ZERO));
             return result;
         }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
index 3fc9c990b3..ef851d6a08 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
@@ -15,8 +15,7 @@
             screen_cpc_base_data
         WHERE
             DEL_FLAG = '0'
-            AND ORG_TYPE = 'agency'
-            AND ORG_ID = #{agencyId}
+            AND PARENT_ID = #{agencyId}
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index ab381cebba..e77b00012b 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -22,8 +22,7 @@
             AND eve.DEL_FLAG = '0'
         WHERE
             diff.DEL_FLAG = '0'
-            AND diff.ORG_TYPE = 'agency'
-            AND diff.ORG_ID = #{agencyId}
+            AND diff.PARENT_ID = #{agencyId}
          ORDER BY
          CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
                        WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index 3fb4174055..af49e77592 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -15,7 +15,6 @@
             screen_govern_rank_data
         WHERE
             DEL_FLAG = '0'
-            AND ORG_TYPE = 'agency'
             AND ORG_ID = #{agencyId}
             AND MONTH_ID = #{monthId}
         ORDER BY
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index f83ec244d7..26007e2997 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -17,7 +17,6 @@
             screen_org_rank_data
         WHERE
             DEL_FLAG = '0'
-            AND ORG_TYPE = 'grid'
             AND PARENT_ID	= #{agencyId}
             AND MONTH_ID = #{monthId}
             ORDER BY
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index 8fbf102170..165b383a81 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -49,7 +49,7 @@
             screen_party_branch_data
         <where>
             DEL_FLAG = '0'
-            AND ORG_TYPE = 'agency'
+
             AND PARENT_ID = #{agencyId}
             AND TYPE = #{category}
                 <!-- 指定月的排行 -->
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 8f17dc796a..74a6e4e661 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -19,8 +19,8 @@
             screen_user_join
         WHERE
             DEL_FLAG = '0'
-            AND ORG_TYPE = 'agency'
-            AND ORG_ID = #{agencyId}
+
+            AND PARENT_ID = #{agencyId}
             AND MONTH_ID = #{monthId}
     </select>
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index a1700b05a4..84e00a0f5d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -12,8 +12,7 @@
             screen_user_total_data
         WHERE
             DEL_FLAG = '0'
-            AND ORG_TYPE = 'agency'
-            AND ORG_ID = #{agencyId}
+            AND PARENT_ID = #{agencyId}
     </select>
 
     <!-- 查询top区概况 -->
@@ -59,7 +58,6 @@
             screen_user_total_data
         WHERE
             DEL_FLAG = '0'
-            AND ORG_TYPE = 'agency'
             AND PARENT_ID = #{agencyId}
          ORDER BY
          (REG_USER_TOTAL + JOIN_USER_TOTAL + TOPIC_TOTAL + ISSUE_TOTAL + PROJECT_TOTAL) DESC,