From ff9b33907ebcc5a0caa8fb0dbabdfdaf8f74c978 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 Aug 2021 10:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A1=BA=E5=BA=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ResiEventDao.xml                | 2 +-
 .../src/main/resources/mapper/ResiEventMentionDao.xml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 0142b1a3df..fc1f3a67ce 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -97,7 +97,7 @@
                 and re.READ_FLAG='1'
                 and re.`STATUS`=#{statusCondition}
             </if>
-            order by re.LATEST_OPERATED_TIME desc
+            order by re.LATEST_OPERATED_TIME desc,rea.sort asc
     </select>
 
     <!-- 报事详情 -->
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 28548eaad9..b7c65d32be 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -46,11 +46,11 @@
             AND rem.READ_FLAG =#{readFlag}
         <if test='readFlag == "un_read" '>
             ORDER BY
-            re.CREATED_TIME ASC
+            re.CREATED_TIME ASC,rea.sort asc
         </if>
         <if test='readFlag == "read" '>
             ORDER BY
-            re.LATEST_OPERATED_TIME DESC
+            re.LATEST_OPERATED_TIME DESC,rea.sort asc
         </if>
     </select>