|
@@ -122,9 +122,7 @@ public class MarkTaskApi {
|
|
Collections.sort(markTaskDTOs, (MarkTaskDTO a, MarkTaskDTO b) -> a.getLevel().compareTo(b.getLevel()));
|
|
Collections.sort(markTaskDTOs, (MarkTaskDTO a, MarkTaskDTO b) -> a.getLevel().compareTo(b.getLevel()));
|
|
}
|
|
}
|
|
long count = markTaskDTOs.stream().filter(o -> Objects.nonNull(o.getUpdatedOn())).count();
|
|
long count = markTaskDTOs.stream().filter(o -> Objects.nonNull(o.getUpdatedOn())).count();
|
|
- if (count == markTaskDTOs.size()) {
|
|
|
|
- Collections.sort(markTaskDTOs, Comparator.comparing(MarkTaskDTO::getUpdatedOn));
|
|
|
|
- } else {
|
|
|
|
|
|
+ if (count != markTaskDTOs.size()) {
|
|
Collections.sort(markTaskDTOs, Comparator.comparing(MarkTaskDTO::getRandomSeqNew));
|
|
Collections.sort(markTaskDTOs, Comparator.comparing(MarkTaskDTO::getRandomSeqNew));
|
|
}
|
|
}
|
|
return new PageableDTO(markTaskDTOs, markTasks.getTotalElements(), markTasks.getTotalPages(), pageable.getPageNumber());
|
|
return new PageableDTO(markTaskDTOs, markTasks.getTotalElements(), markTasks.getTotalPages(), pageable.getPageNumber());
|