From c44c251790eb0dfabaf05bf922214e41a25797bf Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Tue, 28 Apr 2026 15:58:35 +0700 Subject: [PATCH] dev fix add count --- .../nocopy/service/violation/ViolationService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java index cc839e3..58ec317 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -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 violations; - Page violations = violationRepository.findByFileEntityInAndStatusNotAndCreatedDateBetween( - userFiles, ViolationStatus.NOT_OWNER_FILE.name(), start, end, pageable); + 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> violationsByFileId = violations.getContent().stream() .collect(Collectors.groupingBy(v -> v.getFileEntity().getId()));