Merge remote-tracking branch 'origin/dev'

4 years ago · 861aeaa206
1 changed files with 1 additions and 0 deletions
--- 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
@ -242,6 +242,7 @@
        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
            re.REPORT_USER_ID = #{epmetUserId}
        </foreach>
+        order by re.CREATED_TIME desc
    </select>

    <resultMap id="resiEventListResultMap" type="com.epmet.dto.result.ResiEventListResultDTO">