Procházet zdrojové kódy

Birth Certificates sorted
Fixed #710

Andrew Grant před 5 měsíci
rodič
revize
57d1260503

+ 3 - 1
src/main/java/scot/carricksoftware/grants/repositories/places/OrganisationRepository.java

@@ -5,6 +5,8 @@
 
 package scot.carricksoftware.grants.repositories.places;
 
+import org.jetbrains.annotations.NotNull;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 import scot.carricksoftware.grants.domains.places.Organisation;
@@ -22,7 +24,7 @@ public interface OrganisationRepository extends PagingAndSortingRepository<Organ
 
     Optional<Organisation> findById(Long id);
 
-    Iterable<Organisation> findAll();
+    @NotNull Iterable<Organisation> findAll(@NotNull Sort sort);
 
     Optional<Organisation> findByName(String name);
 }

+ 2 - 1
src/main/java/scot/carricksoftware/grants/services/certificates/birthcertificates/BirthCertificateServiceImpl.java

@@ -74,7 +74,8 @@ public class BirthCertificateServiceImpl implements BirthCertificateService {
     }
 
     private Sort getSort() {
-        return Sort.by(Sort.Direction.ASC, "id");
+        return Sort.by(Sort.Direction.ASC, "newBorn.lastName")
+                .and(Sort.by(Sort.Direction.ASC, "newBorn.firstName"));
     }
 
     @Override