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 a418846..38a7836 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -199,9 +199,11 @@ public class ViolationService { List violations; if (startDate != null && endDate != null) { - violations = violationRepository.findByFileEntityInAndCreatedDateBetween(userFiles, startDate, endDate); + violations = violationRepository.findByFileEntityInAndCreatedDateBetweenAndStatusNot(userFiles, + startDate, endDate, ViolationStatus.NOT_OWNER_FILE.name()); } else { - violations = violationRepository.findByFileEntityIn(userFiles); + violations = violationRepository.findByFileEntityInAndStatusNot(userFiles, + ViolationStatus.NOT_OWNER_FILE.name()); } Set inProgressStatuses = Set.of(