@@ -199,9 +199,11 @@ public class ViolationService {
|
|||||||
List<Violation> violations;
|
List<Violation> violations;
|
||||||
|
|
||||||
if (startDate != null && endDate != null) {
|
if (startDate != null && endDate != null) {
|
||||||
violations = violationRepository.findByFileEntityInAndCreatedDateBetween(userFiles, startDate, endDate);
|
violations = violationRepository.findByFileEntityInAndCreatedDateBetweenAndStatusNot(userFiles,
|
||||||
|
startDate, endDate, ViolationStatus.NOT_OWNER_FILE.name());
|
||||||
} else {
|
} else {
|
||||||
violations = violationRepository.findByFileEntityIn(userFiles);
|
violations = violationRepository.findByFileEntityInAndStatusNot(userFiles,
|
||||||
|
ViolationStatus.NOT_OWNER_FILE.name());
|
||||||
}
|
}
|
||||||
|
|
||||||
Set<String> inProgressStatuses = Set.of(
|
Set<String> inProgressStatuses = Set.of(
|
||||||
|
|||||||
Reference in New Issue
Block a user