diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index 3c772457..3fccfd47 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -101,7 +101,16 @@
                         0 as issueTotal,
                         0 as topicTotal,
                         0 as projectTotal, 0 as companyTotal
-                from esua_epdc_user.epdc_user eu
+                from (SELECT utmp.`ID`,
+                             utmp.`PARTY_FLAG`,
+                             utmp.`DEL_FLAG` ,
+                             CASE WHEN utmp.`DEPT_ID` IS NULL or utmp.`DEPT_ID` = 0 THEN gtmp.`GRID_ID` ELSE utmp.`DEPT_ID` END AS DEPT_ID
+                      FROM `esua_epdc_user`.`epdc_user` utmp
+                               LEFT JOIN(
+                          SELECT eugr.USER_ID, eugr.GRID_ID
+                          FROM `esua_epdc_user`.`epdc_user_grid_relation` eugr
+                          WHERE eugr.DEL_FLAG= '0'
+                          ORDER BY eugr.CREATED_TIME)  gtmp ON gtmp.`USER_ID`= utmp.`ID` GROUP BY utmp.`ID`) eu
                 where eu.DEL_FLAG=0
                 group by eu.DEPT_ID
 
@@ -247,7 +256,16 @@ FROM esua_epdc_admin.sys_dept co
                         0 as issueTotal,
                         0 as topicTotal,
                         0 as projectTotal, 0 as companyTotal
-                from esua_epdc_user.epdc_user eu
+                from (SELECT utmp.`ID`,
+                             utmp.`PARTY_FLAG`,
+                             utmp.`DEL_FLAG` ,
+                             CASE WHEN utmp.`DEPT_ID` IS NULL or utmp.`DEPT_ID` = 0 THEN gtmp.`GRID_ID` ELSE utmp.`DEPT_ID` END AS DEPT_ID
+                      FROM `esua_epdc_user`.`epdc_user` utmp
+                               LEFT JOIN(
+                          SELECT eugr.USER_ID, eugr.GRID_ID
+                          FROM `esua_epdc_user`.`epdc_user_grid_relation` eugr
+                          WHERE eugr.DEL_FLAG= '0'
+                          ORDER BY eugr.CREATED_TIME)  gtmp ON gtmp.`USER_ID`= utmp.`ID` GROUP BY utmp.`ID`) eu
                 where eu.DEL_FLAG=0
                 group by eu.DEPT_ID
 
@@ -395,8 +413,19 @@ union all
                         0 as issueTotal,
                         0 as topicTotal,
                         0 as projectTotal, 0 as companyTotal
-                from esua_epdc_user.epdc_user eu
-                where eu.DEL_FLAG=0
+                from (SELECT utmp.`ID`,
+                             utmp.`PARTY_FLAG`,
+                             utmp.`DEL_FLAG` ,
+                             CASE WHEN utmp.`DEPT_ID` IS NULL or utmp.`DEPT_ID` = 0 THEN gtmp.`GRID_ID` ELSE utmp.`DEPT_ID` END AS DEPT_ID
+                      FROM `esua_epdc_user`.`epdc_user` utmp
+                               LEFT JOIN(
+                          SELECT eugr.USER_ID, eugr.GRID_ID
+                          FROM `esua_epdc_user`.`epdc_user_grid_relation` eugr
+                          WHERE eugr.DEL_FLAG= '0'
+                          ORDER BY eugr.CREATED_TIME)  gtmp ON gtmp.`USER_ID`= utmp.`ID` GROUP BY utmp.`ID`) eu
+                where eu.DEL_FLAG=0 AND eu.DEPT_ID NOT IN( SELECT t.`dept_id`
+                                                           FROM `esua_epdc_admin`.`sys_dept_config` t
+                                                           WHERE t.`del_flag`= 0)
                 group by eu.DEPT_ID
 				UNION all
 				SELECT