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

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

Browse Source
This commit is contained in:
backdev
2026-04-24 12:54:48 +07:00
parent d2d78b5117
commit cdaa6c7ce2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/handler/ViolationHandler.java
+5 -4
View File
@@ -112,10 +112,10 @@ public class ViolationHandler implements RequestHandler {
); );
} else { } else {
violationPage = violationService.getViolationsByFiles( violationPage = violationService.getViolationsByFiles(
targetFiles, targetFiles, violationRequest.getPage(), violationRequest.getSize(),
violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection() violationRequest.getSortDirection());
);
} }
ViolationResponse.ViolationDto firstShowViolation = null; ViolationResponse.ViolationDto firstShowViolation = null;
List<Violation> content = violationPage.getContent(); List<Violation> content = violationPage.getContent();
List<ViolationResponse.ViolationDto> violationDtos = new ArrayList<>(); List<ViolationResponse.ViolationDto> violationDtos = new ArrayList<>();
@@ -129,7 +129,8 @@ public class ViolationHandler implements RequestHandler {
} }
for (Violation violation : content) { for (Violation violation : content) {
if (firstShowViolation != null && Objects.equals(firstShowViolation.getId(), violation.getId())) continue; if (violation.getStatus().equals(ViolationStatus.NOT_OWNER_FILE.name()) ||
firstShowViolation != null && Objects.equals(firstShowViolation.getId(), violation.getId())) continue;
ViolationResponse.ViolationDto violationDto = ViolationResponse.ViolationDto.fromEntity(violation); ViolationResponse.ViolationDto violationDto = ViolationResponse.ViolationDto.fromEntity(violation);
violationDto.setCountry(geoCountryService.getCountryName(violation.getPageUrl())); violationDto.setCountry(geoCountryService.getCountryName(violation.getPageUrl()));
src/main/java/ru/soune/nocopy/service/violation/ViolationStatus.java
+1 -1
View File
@@ -1,5 +1,5 @@
package ru.soune.nocopy.service.violation; package ru.soune.nocopy.service.violation;
public enum ViolationStatus { public enum ViolationStatus {
NEW , SHOWED, LEGAL_IN_WORK, COMPLAINT_IN_WORK, COMPLAINT_AND_LEGAL_IN_WORK , AUTHORIZED_USE NEW , SHOWED, LEGAL_IN_WORK, COMPLAINT_IN_WORK, COMPLAINT_AND_LEGAL_IN_WORK , AUTHORIZED_USE, NOT_OWNER_FILE
} }