From 7f676f94db76da3cd9620df2342f72fdfc3ef5e1 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Fri, 6 Nov 2020 09:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java     | 5 +++++
 .../main/java/com/elink/esua/epdc/entity/NoticeEntity.java   | 5 +++++
 .../epdc-news-server/src/main/resources/mapper/NoticeDao.xml | 3 +--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
index 69bdd52e..efe32422 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
@@ -164,4 +164,9 @@ public class NoticeDTO implements Serializable {
      */
     private List<String> noticeCategoriesShow;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java
index d5cca655..58ea4058 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java
@@ -121,4 +121,9 @@ public class NoticeEntity extends BaseEpdcEntity {
      * 通知视频地址
      */
     private String noticeVideoUrl;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
 }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml
index 7b46adec..65a5ec39 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml
@@ -127,9 +127,8 @@
           <if test='noticeCategory != null and noticeCategory != "" and noticeCategory == "notice_navigation_hot"'>
               en.READING_AMOUNT DESC
           </if>
-          <if test='noticeCategory != null and noticeCategory != "" and noticeCategory != "notice_navigation_hot"'>
+              en.SORT,
               en.RELEASE_TIME DESC
-          </if>
         LIMIT #{pageIndex},#{pageSize}
     </select>