代码还原

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

@@ -77,17 +77,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     @Override
     public PageData<NoticeDTO> page(Map<String, Object> params) {
-        String noticeTitle = (String) params.get("noticeTitle");
+        params.put("createdBy", SecurityUser.getUserId());
-        params.put("noticeTitle", noticeTitle.trim());
-        QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
-                .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId())
-                .eq("EXTEND_FLAG", NumConstant.ZERO_L);
 
-        IPage<NoticeEntity> page = baseDao.selectPage(
+        IPage<NoticeDTO> page = getPage(params);
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        List<NoticeDTO> list = baseDao.getModulePageList(params);
-                wrapper
+        return new PageData<>(list, page.getTotal());
-        );
-        return getPageData(page, NoticeDTO.class);
     }
 
     @Override