Merge remote-tracking branch 'origin/dev_resi_event' into dev

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>
 
     <!-- 报事详情 -->
@@ -143,6 +143,7 @@
         LEFT JOIN resi_event_report_org ro ON (ro.RESI_EVENT_ID = re.ID AND ro.DEL_FLAG = '0')
         WHERE re.DEL_FLAG = '0'
             AND re.ID = #{eventId}
+        order by ea.sort asc
     </select>
 
     <!-- 更新报事人红点状态 -->

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>