lin 3 years ago
parent
commit
a7e5663ecd

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

@@ -287,7 +287,7 @@
       <if test="dto.endDate != null"> and rda.last_alarm_time <![CDATA[ <= ]]> #{dto.endDate}</if>
       <include refid="permissionCondition"/>
     </where>
-    order by rda.last_alarm_time,rda.id desc
+    order by rda.last_alarm_time desc,rda.id desc
   </select>
 
   <update id="deleteByDeviceId">

+ 1 - 1
zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -551,7 +551,7 @@
       <if test="dto.endDate != null"> and rd.install_date <![CDATA[ <= ]]> #{dto.endDate}</if>
       <include refid="permissionCondition"/>
     </where>
-    order by rd.create_date,rd.id desc
+    order by rd.create_date desc,rd.id desc
   </select>
 
   <select id="findList_COUNT" resultType="Long">