Browse Source

PersonImage Sort By person

apg 1 week ago
parent
commit
abdbe08943

+ 5 - 1
src/main/java/scot/carricksoftware/grants/services/images/personimage/PersonImageServiceImpl.java

@@ -73,7 +73,11 @@ public class PersonImageServiceImpl implements PersonImageService {
     }
 
     private Sort getSort() {
-        return Sort.by(Sort.Direction.ASC, "id");
+        return Sort.by(Sort.Direction.ASC, "person.lastName")
+                .and(Sort.by(Sort.Direction.ASC, "person.firstName")
+                        .and(Sort.by(Sort.Direction.ASC, "person.firstName")
+                                .and(Sort.by(Sort.Direction.ASC,  "order")
+                                        .and(Sort.by(Sort.Direction.ASC, "level")))));
     }
 
     @Override

+ 2 - 2
src/main/java/scot/carricksoftware/grants/services/text/persontext/PersonTextServiceImpl.java

@@ -74,8 +74,8 @@ public class PersonTextServiceImpl implements PersonTextService {
         return Sort.by(Sort.Direction.ASC, "person.lastName")
                 .and(Sort.by(Sort.Direction.ASC, "person.firstName")
                         .and(Sort.by(Sort.Direction.ASC, "person.firstName")
-                .and(Sort.by(Sort.Direction.ASC,  "order")
-                        .and(Sort.by(Sort.Direction.ASC, "level")))));
+                                .and(Sort.by(Sort.Direction.ASC, "order")
+                                        .and(Sort.by(Sort.Direction.ASC, "level")))));
     }
 
     @Override