Merge remote-tracking branch 'origin/dev_bugfix_ljj' into release_temp

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -36,24 +36,29 @@
         and ro.ORG_ID = #{orgId}
         <if test='eventType == "undisposed" '>
             AND ro.ORG_READ = 'un_read'
-            ORDER BY re.CREATED_TIME
         </if>
         <if test='eventType == "processed" '>
             AND ro.ORG_READ = 'read'
             AND re.`STATUS` = 'processing'
-            ORDER BY re.LATEST_OPERATED_TIME DESC
         </if>
         <if test='eventType == "transferred" '>
             AND ro.ORG_READ = 'read'
             AND re.`STATUS` = 'closed_case'
-            ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
         LEFT JOIN resi_event_attachment rea
         ON (rea.RESI_EVENT_ID = t.eventId)
-        where rea.DEL_FLAG = '0'
+        where  rea.DEL_FLAG = '0'
         AND rea.ATTACHMENT_TYPE = 'image'
-        order by rea.sort asc
+        <if test='eventType == "undisposed" '>
+            ORDER BY t.eventTime,rea.sort asc
+        </if>
+        <if test='eventType == "processed" '>
+            ORDER BY t.eventTime DESC,rea.sort asc
+        </if>
+        <if test='eventType == "transferred" '>
+            ORDER BY t.eventTime DESC,rea.sort asc
+        </if>
     </select>