diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenCommunityHeadServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenCommunityHeadServiceImpl.java
index 5c5e5038..ccf22df2 100755
--- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenCommunityHeadServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenCommunityHeadServiceImpl.java
@@ -69,8 +69,12 @@ public class ScreenCommunityHeadServiceImpl extends BaseServiceImpl<ScreenCommun
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<ScreenCommunityHeadEntity> wrapper = new QueryWrapper<>();
+
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
+        String communityId = (String)params.get("communityId");
+        wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId);
+
         return wrapper;
     }
 
diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenTopicServiceImpl.java
index 5735b1bb..7cfbcbe5 100755
--- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenTopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenTopicServiceImpl.java
@@ -71,6 +71,12 @@ public class ScreenTopicServiceImpl extends BaseServiceImpl<ScreenTopicDao, Scre
         QueryWrapper<ScreenTopicEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
+        String type = (String)params.get("type");
+        wrapper.eq(StringUtils.isNotBlank(type), "type", type);
+
+        String communityId = (String)params.get("communityId");
+        wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId);
+
         return wrapper;
     }