From 86cdcba5e82309b3c0d74dd8456543aafdca953d Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Wed, 6 May 2020 17:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/redis/NewsCategoryRedis.java    |  4 ++--
 .../service/impl/NewsCategoryServiceImpl.java |  4 ++--
 .../src/main/resources/mapper/NewsDao.xml     | 21 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/redis/NewsCategoryRedis.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/redis/NewsCategoryRedis.java
index 4e7610b..05bbd07 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/redis/NewsCategoryRedis.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/redis/NewsCategoryRedis.java
@@ -36,11 +36,11 @@ public class NewsCategoryRedis {
 
     }
 
-    public void set(){
+    public void set() {
 
     }
 
-    public String get(String id){
+    public String get(String id) {
         return null;
     }
 
diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
index 043092b..0b9b7b7 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
@@ -20,9 +20,9 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.NewsCategoryDao;
 import com.elink.esua.epdc.dto.NewsCategoryDTO;
 import com.elink.esua.epdc.entity.NewsCategoryEntity;
@@ -124,4 +124,4 @@ public class NewsCategoryServiceImpl extends BaseServiceImpl<NewsCategoryDao, Ne
         return maps;
     }
 
-}
+}
\ No newline at end of file
diff --git a/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml b/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml
index db811eb..0a7a42c 100644
--- a/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml
+++ b/epdc-cloud-news/src/main/resources/mapper/NewsDao.xml
@@ -17,21 +17,20 @@
             en.ID AS id,
             en.NEWS_TITLE AS newsTitle,
             en.NEWS_RELEASE_START_TIME AS newsStartTime,
-            SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName,
+            SUBSTRING_INDEX( en.ALL_DEPT_NAMES, '-',- 1 ) AS deptName,
             nc.CATEGORY_NAME AS newsCategoryName,
             en.NEWS_IMAGE_URL AS newsImageUrl
         FROM
-            epdc_news en
-        LEFT JOIN epdc_news_category nc ON en.NEWS_CATERORY_ID = nc.ID
-        RIGHT JOIN epdc_news_department ed ON en.ID = ed.NEWS_ID
+            ( SELECT nd.NEWS_ID FROM epdc_news_department nd WHERE nd.DEPT_ID = #{deptId} AND nd.DEL_FLAG = '0' ORDER BY nd.CREATED_TIME DESC ) ed
+            LEFT JOIN epdc_news en ON ed.NEWS_ID = en.ID
+            LEFT JOIN epdc_news_category nc ON en.NEWS_CATERORY_ID = nc.ID
         WHERE
-            ed.DEPT_ID = #{deptId}
-        AND en.NEWS_RELEASE_START_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
-        AND en.NEWS_RELEASE_END_TIME >= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
-        AND en.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
-        AND en.NEWS_RELEASE_STATE = '0'
-        AND en.NEWS_UP_DOWN_STATE = '0'
-        AND en.DEL_FLAG = '0'
+            en.DEL_FLAG = '0'
+            AND en.NEWS_RELEASE_START_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+            AND en.NEWS_RELEASE_END_TIME >= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+            AND en.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+            AND en.NEWS_RELEASE_STATE = '0'
+            AND en.NEWS_UP_DOWN_STATE = '0'
         ORDER BY
             en.NEWS_RELEASE_START_TIME DESC,en.CREATED_TIME DESC
             LIMIT #{pageIndex},#{pageSize}