From 569452b180e01a0aae5c8cf6acdbc6b3038c4896 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 18 Aug 2021 16:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/NoticeServiceImpl.java  | 14 ++++----------
 .../src/main/resources/mapper/NoticeDao.xml        | 14 +++++++-------
 2 files changed, 11 insertions(+), 17 deletions(-)

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 2cee58c..8e51036 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,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("noticeTitle", noticeTitle.trim());
-        QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
-                .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId())
-                .eq("EXTEND_FLAG", NumConstant.ZERO_L);
+        params.put("createdBy", SecurityUser.getUserId());
 
-        IPage<NoticeEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                wrapper
-        );
-        return getPageData(page, NoticeDTO.class);
+        IPage<NoticeDTO> page = getPage(params);
+        List<NoticeDTO> list = baseDao.getModulePageList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
diff --git a/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml b/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml
index 9cdeaa6..ab158b5 100644
--- a/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml
+++ b/epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml
@@ -99,13 +99,13 @@
         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'
-            <if test="noticeTitle != null and noticeTitle !=''">
-                AND en.NOTICE_TITLE like '%${noticeTitle}%'
-            </if>
-            <if test="typeId != null and typeId !=''">
-                AND FIND_IN_SET(#{typeId},ALL_TYPE_ID)
-            </if>
+        and en.DEL_FLAG='0'
+        <if test="noticeTitle != null and noticeTitle !=''">
+            AND en.NOTICE_TITLE like '%${noticeTitle}%'
+        </if>
+        <if test="typeId != null and typeId !=''">
+            AND FIND_IN_SET(#{typeId},ALL_TYPE_ID)
+        </if>
         order by en.TOP_FLAG desc,en.TOP_TIME desc,en.CREATED_TIME desc
     </select>
     <select id="selectCountByTypeId" resultType="int">