From 235092e851ed2d0b49322d1a6fc420fb2da946d2 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 2 Jun 2020 14:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/NoticeDao.xml                | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 29ebb686..4ab180f3 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
@@ -113,7 +113,12 @@
             AND en.DEL_FLAG = '0'
             AND en.NOTICE_RELEASE_STATE = 1
         ORDER BY
-            en.RELEASE_TIME DESC
+          <if test='noticeCategory != null and noticeCategory != "" and noticeCategory == "6"'>
+              en.RELEASE_TIME DESC
+          </if>
+          <if test='noticeCategory != null and noticeCategory != "" and noticeCategory != "6"'>
+              en.READING_AMOUNT DESC
+          </if>
         LIMIT #{pageIndex},#{pageSize}
     </select>