diff --git a/src/main/java/ru/soune/nocopy/dto/file/FileEntityRequest.java b/src/main/java/ru/soune/nocopy/dto/file/FileEntityRequest.java index 3a4b307..7231e63 100644 --- a/src/main/java/ru/soune/nocopy/dto/file/FileEntityRequest.java +++ b/src/main/java/ru/soune/nocopy/dto/file/FileEntityRequest.java @@ -81,7 +81,4 @@ public class FileEntityRequest { @JsonProperty("permissions") private Map permissions; - - @JsonProperty("admin_id") - private Long adminId; } diff --git a/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java b/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java index 77293a3..a49b79f 100644 --- a/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/FileInternalControlHandler.java @@ -33,8 +33,7 @@ public class FileInternalControlHandler implements RequestHandler { @Override public BaseResponse handle(BaseRequest request) throws Exception { try { - FileEntityRequest fileRequest = objectMapper.convertValue( - request.getMessageBody(), FileEntityRequest.class); + FileEntityRequest fileRequest = objectMapper.convertValue(request.getMessageBody(), FileEntityRequest.class); String action = fileRequest.getAction(); switch (action) { @@ -89,7 +88,7 @@ public class FileInternalControlHandler implements RequestHandler { try { String appealId = fileRequest.getAppealId(); Boolean approve = fileRequest.getApprove(); - String comment = fileRequest.getComment(); + String comment = fileRequest.getComment() == null ? "": fileRequest.getComment(); if (appealId == null || approve == null) { return new BaseResponse(request.getMsgId(),