diff --git a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java index 44bdc7f5d9..19f613bd30 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java @@ -36,6 +36,9 @@ import java.util.stream.Collectors; public abstract class DaoUtil { + public static final String DEFAULT_SORT_PROPERTY = "id"; + public static final Sort DEFAULT_SORT = Sort.by(Sort.Direction.ASC, DEFAULT_SORT_PROPERTY); + private DaoUtil() { } @@ -70,7 +73,7 @@ public abstract class DaoUtil { public static Sort toSort(SortOrder sortOrder, Map columnMap) { if (sortOrder == null) { - return Sort.unsorted(); + return DEFAULT_SORT; } else { String property = sortOrder.getProperty(); if (columnMap.containsKey(property)) {