|
|
|
@ -231,7 +231,7 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { |
|
|
|
} |
|
|
|
|
|
|
|
List<DashboardInfo> loadedMobileDashboards = new ArrayList<>(); |
|
|
|
PageLink pageLink = new PageLink(16, 0, null, new SortOrder("createdTime", SortOrder.Direction.ASC)); |
|
|
|
PageLink pageLink = new PageLink(16, 0, null, new SortOrder("title", SortOrder.Direction.ASC)); |
|
|
|
PageData<DashboardInfo> pageData = null; |
|
|
|
do { |
|
|
|
pageData = dashboardService.findMobileDashboardsByTenantId(tenantId, pageLink); |
|
|
|
@ -245,7 +245,7 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { |
|
|
|
Integer order1 = o1.getMobileOrder(); |
|
|
|
Integer order2 = o2.getMobileOrder(); |
|
|
|
if (order1 == null && order2 == null) { |
|
|
|
return (int)(o1.getCreatedTime() - o2.getCreatedTime()); |
|
|
|
return o1.getTitle().compareTo(o2.getTitle()); |
|
|
|
} else if (order1 == null && order2 != null) { |
|
|
|
return 1; |
|
|
|
} else if (order2 == null) { |
|
|
|
|