|
@@ -112,7 +112,12 @@ public class AlarmRecordController {
|
|
|
Sort sort = new Sort();
|
|
|
sort.setColumn("triggerTime");
|
|
|
sort.setAsc(false);
|
|
|
- orders = Lists.newArrayList(sort);
|
|
|
+
|
|
|
+ Sort sort1 = new Sort();
|
|
|
+ sort.setColumn("id");
|
|
|
+ sort.setAsc(false);
|
|
|
+
|
|
|
+ orders = Lists.newArrayList(sort, sort1);
|
|
|
}
|
|
|
// pageQueryAlarmRecordDTO中的排序转换为queryDTO中的排序
|
|
|
List<OrderDTO> orderDTOList = ConvertAlarmRecordTool.INSTANCE.convert2OrderDTOList(orders);
|