告警列表BUG

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceAlarmMapper.xml

@@ -283,11 +283,11 @@
       <if test="dto.deviceNo != null and dto.deviceNo != ''">and (rd.device_no LIKE concat('%',#{dto.deviceNo},'%') or rd.meter_no LIKE concat('%',#{dto.deviceNo},'%') )</if>
       <if test="dto.alarmTypeId != null">and rda.alarm_type_id = #{dto.alarmTypeId}</if>
       <if test="dto.handleStatus != null">and rda.handle_status = #{dto.handleStatus}</if>
-      <if test="dto.startDate != null"> and rd.last_receive_time <![CDATA[ >= ]]> #{dto.startDate}</if>
-      <if test="dto.endDate != null"> and rd.last_receive_time <![CDATA[ <= ]]> #{dto.endDate}</if>
+      <if test="dto.startDate != null"> and rda.last_alarm_time <![CDATA[ >= ]]> #{dto.startDate}</if>
+      <if test="dto.endDate != null"> and rda.last_alarm_time <![CDATA[ <= ]]> #{dto.endDate}</if>
       <include refid="permissionCondition"/>
     </where>
-    order by rda.last_alarm_time desc
+    order by rda.last_alarm_time,rda.id desc
   </select>
 
   <update id="deleteByDeviceId">