diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml index 6bd0c12f..a388607d 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml @@ -311,7 +311,7 @@ AND NEWS_UP_DOWN_STATE = '0' AND date_format(CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY DEPT_ID)news on news.DEPT_ID=d.id - WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party' OR d.TYPE_KEY = 'district_party') + WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party') AND d.DEL_FLAG=0 AND d.id NOT IN ( SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' @@ -413,7 +413,7 @@ AND sd.id NOT IN ( SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) - AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party' OR sd.TYPE_KEY = 'district_party') + AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party')