Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java =================================================================== diff -u -r4dc7b5096563ded006b460523140a4ab9569933e -r58b28b26165b1b600be40720c6a26fcf2110a8f1 --- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java (.../QbService.java) (revision 4dc7b5096563ded006b460523140a4ab9569933e) +++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java (.../QbService.java) (revision 58b28b26165b1b600be40720c6a26fcf2110a8f1) @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -52,6 +53,10 @@ private IUserManagementService userManagementService; + public static final Comparator COLLECTION_NAME_COMPARATOR = (c1, + c2) -> c1 == null || c1.getName() == null ? (c2 == null || c2.getName() == null ? 0 : -1) + : c1.getName().compareTo(c2.getName()); + @Override public QbQuestion getQbQuestionByUid(Long qbQuestionUid) { return qbDAO.getQbQuestionByUid(qbQuestionUid); @@ -293,7 +298,9 @@ Map map = new HashMap<>(); map.put("userId", userId); map.put("personal", false); - return qbDAO.findByProperties(QbCollection.class, map); + List result = qbDAO.findByProperties(QbCollection.class, map); + Collections.sort(result, COLLECTION_NAME_COMPARATOR); + return result; } @Override