From 4294127c0a779a18094a66afb11f0c0a22159104 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Fri, 29 May 2020 18:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E9=97=BB=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/NewsServiceImpl.java  | 7 +++++--
 epdc-cloud-news/src/main/resources/mapper/NewsDao.xml      | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
index 4fedf8b..57ee44b 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
@@ -120,11 +120,14 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         }
         wrapper.eq(FieldConstant.CREATED_BY, user.getId());
         //draft 前端传上来的一个标志 有则代表是存草稿箱的 1
-        if (StringUtils.isNotEmpty(draft)) {
-            wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value());
+        if (StringUtils.isNotBlank(draft)) {
+            wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.YES.value());
         } else {
             wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.NO.value());
         }
+        wrapper.select("ID", "NEWS_TITLE", "NEWS_UP_DOWN_STATE", "NEWS_RELEASE_END_TIME", "NEWS_RELEASE_START_TIME", "NEWS_RELEASE_STATE",
+                "NEWS_IMAGE_URL", "NEWS_CATERORY_ID", "ALL_DEPT_IDS", "ALL_DEPT_NAMES", "DEPT_ID", "DEPT_NAME", "NEWS_PROPERTY",
+                "CREATED_TIME", "CREATOR_NAME", "LIKE_NUMBER", "UN_LIKE_NUMBER", "READING_AMOUNT", "BANNER_FLAG");
         wrapper.orderByDesc(FieldConstant.CREATED_TIME);
         return wrapper;
     }
diff --git a/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml b/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml
index 9a7bb0e..d3bf6f2 100644
--- a/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml
+++ b/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml
@@ -106,7 +106,9 @@
     </update>
     <select id="selectAllPage" resultType="com.elink.esua.epdc.dto.NewsDTO">
         SELECT
-            *
+            n.ID, n.NEWS_TITLE, n.NEWS_UP_DOWN_STATE, n.NEWS_RELEASE_END_TIME, n.NEWS_RELEASE_START_TIME, n.NEWS_RELEASE_STATE,
+            n.NEWS_IMAGE_URL, n.NEWS_CATERORY_ID, n.ALL_DEPT_IDS, n.ALL_DEPT_NAMES, n.DEPT_ID, n.DEPT_NAME, n.NEWS_PROPERTY,
+            n.CREATED_TIME, n.CREATOR_NAME, n.LIKE_NUMBER, n.UN_LIKE_NUMBER, n.READING_AMOUNT, n.BANNER_FLAG
         FROM
         (
             SELECT DISTINCT nd.NEWS_ID FROM epdc_news_department nd WHERE nd.DEL_FLAG = '0'