dev fix add count

2026-04-28 15:58:35 +07:00
parent 61e47975ff
commit c44c251790
1 changed files with 8 additions and 2 deletions
@@ -76,9 +76,15 @@ public class ViolationService {
        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC,
                "createdDate");
        Pageable pageable = PageRequest.of(page, size, sort);
+        Page<Violation> violations;

-        Page<Violation> violations = violationRepository.findByFileEntityInAndStatusNotAndCreatedDateBetween(
+        if (start == null || end == null) {
+            violations = violationRepository.findByFileEntityInAndStatusNot( userFiles,
+                    ViolationStatus.NOT_OWNER_FILE.name(),pageable);
+        } else {
+            violations = violationRepository.findByFileEntityInAndStatusNotAndCreatedDateBetween(
                    userFiles, ViolationStatus.NOT_OWNER_FILE.name(), start, end, pageable);
+        }

        Map<String, List<Violation>> violationsByFileId = violations.getContent().stream()
                .collect(Collectors.groupingBy(v -> v.getFileEntity().getId()));