diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 53886f82..7c118a94 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -164,7 +164,7 @@ when #{timestamp} then '4' end as actCurrentState, - IF(relation.USER_ID = #{userId},'1','0') as signupFlag + IF(relation.USER_ID = #{userId},'1','0') as signupFlag,actInfo.CREATED_TIME FROM epdc_act_info actInfo left join epdc_act_user_relation relation on relation.DEL_FLAG = '0' @@ -182,7 +182,7 @@ #{timestamp} ) temp - ORDER BY temp.actCurrentState ASC + ORDER BY temp.actCurrentState ASC,temp.CREATED_TIME desc ,temp.PUBLISH_TIME DESC ,temp.ACT_START_TIME ASC LIMIT #{pageIndex},#{pageSize}