扩展公告: 修改为拥有权限的内容

epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -90,10 +90,16 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     @Override
     public PageData<NoticeDTO> extendPage(Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RenException("登陆状态失效，请退出重新登陆");
+        }
+
+        params.put("deptIdList", user.getDeptIdList());
         String noticeTitle = (String) params.get("noticeTitle");
         params.put("noticeTitle", noticeTitle.trim());
 
-        QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
+        QueryWrapper<NoticeEntity> wrapper = this.getExtendWrapper(params)
                 .ne("EXTEND_FLAG", NumConstant.ZERO_L);
 
         IPage<NoticeEntity> page = baseDao.selectPage(
@@ -134,6 +140,19 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         return wrapper;
     }
 
+    private QueryWrapper<NoticeEntity> getExtendWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String noticeTitle = ((String) params.get("noticeTitle"));
+        if (StringUtils.isNotBlank(noticeTitle)) {
+            noticeTitle.trim();
+        }
+        QueryWrapper<NoticeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
+                .like(StringUtils.isNotBlank(noticeTitle), "NOTICE_TITLE", noticeTitle)
+                .in("DEPT_ID", params.get("deptIdList"));
+        return wrapper;
+    }
+
     @Override
     public NoticeDTO get(String id) {
         NoticeEntity entity = baseDao.selectById(id);