From 9e6e7f68b6b899e78735eeca9886ca424397f3d7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 22 Aug 2022 13:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=86=E4=B8=AA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml         | 1 +
 .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index 8ec8db4b55..ad7db30b76 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -83,6 +83,7 @@
             <if test='null != path and path != ""'>
                 AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%')
             </if>
+        order by pa.HOLD_TIME desc,ao.JOIN_ORG_ID
     </select>
 
     <select id="selectPageList" parameterType="com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO" resultType="com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO">
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml
index a9c155a9e1..93228af389 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml
@@ -66,5 +66,6 @@
             </if>
             AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%')
             AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0')
+        order by REMIND_TIME desc
     </select>
 </mapper>
\ No newline at end of file