backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev fix add count
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-04-28 15:58:35 +07:00
parent 61e47975ff
commit c44c251790
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/violation/ViolationService.java
+8 -2
View File
@@ -76,9 +76,15 @@ public class ViolationService {
Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC, Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC,
"createdDate"); "createdDate");
Pageable pageable = PageRequest.of(page, size, sort); Pageable pageable = PageRequest.of(page, size, sort);
Page<Violation> violations;
Page<Violation> violations = violationRepository.findByFileEntityInAndStatusNotAndCreatedDateBetween( if (start == null || end == null) {
userFiles, ViolationStatus.NOT_OWNER_FILE.name(), start, end, pageable); 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() Map<String, List<Violation>> violationsByFileId = violations.getContent().stream()
.collect(Collectors.groupingBy(v -> v.getFileEntity().getId())); .collect(Collectors.groupingBy(v -> v.getFileEntity().getId()));