diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
index 283e5f63c..bc0f431b3 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
@@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.SysSmsTemplateConstant;
@@ -97,6 +99,13 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
 
     @Override
     public PageData<GroupManagementDTO> page(Map<String, Object> params) {
+        //获取数据权限
+        UserDetail userDetail = SecurityUser.getUser();
+        if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+            params.put("deptIdList",null);
+        }else {
+            params.put("deptIdList",userDetail.getDeptIdList());
+        }
         IPage<GroupManagementDTO> page = getPage(params);
         List<GroupManagementDTO> list = baseDao.selectListOfGroups(params);
         return new PageData<>(list, page.getTotal());
@@ -530,13 +539,13 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
         return !StringUtils.isEmpty(formDto.getMobile());
     }
 
-    /** 
+    /**
      * @Description: 社群管理 建群通过、不通过 短信通知
-     * @Param: [dto, userId] 
-     * @return: void 
-     * @Author: zy 
-     * @Date: 2020-01-08 
-     */ 
+     * @Param: [dto, userId]
+     * @return: void
+     * @Author: zy
+     * @Date: 2020-01-08
+     */
     private void groupManagementSmsNotification(GroupSettingStateDTO dto, String groupId){
         //根据社区id，获取用户手机号
         String mobile = baseDao.queryGroupUserMOBILE(groupId);
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
index e6944dd72..5eabd576d 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -117,6 +119,13 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
     @Override
     public PageData<TopicDTO> listTopic(Map<String, Object> params) {
         IPage<TopicDTO> page = getPage(params);
+        //获取数据权限
+        UserDetail userDetail = SecurityUser.getUser();
+        if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+            params.put("deptIdList",null);
+        }else {
+            params.put("deptIdList",userDetail.getDeptIdList());
+        }
         List<TopicDTO> list = baseDao.selectListTopic(params);
         return new PageData<>(list, page.getTotal());
     }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
index 97bf9facb..5cedcb05b 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
@@ -18,6 +18,12 @@
             AND ugp.LORD_FLAG = '1'
         WHERE
             gp.DEL_FLAG = '0'
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND gp.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
+        </if>
             <if test="state != null and state != ''">
                 AND gp.STATE = #{state}
             </if>
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
index 3084f88a0..389b0d692 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -197,6 +197,12 @@
         WHERE
             temp.DEL_FLAG = '0'
             AND temp.STATE IN ( 0, 5, 20)
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND temp.GRID_ID in
+            <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
+                #{deptId}
+            </foreach>
+        </if>
         <if test="associatedType != null and associatedType != ''">
             AND temp.STATE in (0,5,10,15)
         </if>
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml
index 0a7a42c00..7d6d5e76e 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml
@@ -110,7 +110,7 @@
         GROUP BY
         nd.NEWS_ID
         ) t0
-        LEFT JOIN epdc_news n ON t0.NEWS_ID = n.ID
+        LEFT JOIN epdc_news n ON find_in_set(t0.NEWS_ID, n.ALL_DEPT_IDS)
         WHERE
         n.ID IS NOT NULL
         AND n.DEL_FLAG = '0'
@@ -148,4 +148,4 @@
     <update id="updateDeptNameByDeptId">
         UPDATE epdc_news SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() WHERE DEPT_ID = #{deptId}
     </update>
-</mapper>
\ No newline at end of file
+</mapper>