diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index c9fd35c..481d321 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit c9fd35cf2875817614375b959d412bc27c39f418
+Subproject commit 481d321e23b6e3b6fecd4d2faac3e74b024d1613
diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
index 69f35c7..5915838 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
@@ -77,8 +77,12 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     @Override
     public PageData<NoticeDTO> page(Map<String, Object> params) {
-        params.put("createdBy", SecurityUser.getUserId());
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RenException("登陆状态失效，请退出重新登陆");
+        }
 
+        params.put("deptIdList", user.getDeptIdList());
         IPage<NoticeDTO> page = getPage(params);
         List<NoticeDTO> list = baseDao.getModulePageList(params);
         return new PageData<>(list, page.getTotal());
diff --git a/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml b/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml
index e9d48d7..3b6e87b 100644
--- a/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml
+++ b/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml
@@ -99,8 +99,11 @@
         SELECT en.*,mt.type_name
         FROM `epdc_notice` en
         left join epdc_module_type mt on mt.id=en.TYPE_ID
-        where en.CREATED_BY=#{createdBy}
-        and en.DEL_FLAG='0'
+        where en.DEL_FLAG='0'
+        AND en.DEPT_ID IN
+        <foreach collection="deptIdList" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
         <if test="noticeTitle != null and noticeTitle !=''">
             AND en.NOTICE_TITLE like '%${noticeTitle}%'
         </if>