diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java index 2d927427d..2d874f69a 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java @@ -141,10 +141,12 @@ public class AccountValidationConfig { AccountTypeDictionary.class, AccountError.RequiredFieldEmpty, AccountError.WrongFieldValue, - accountType -> { - if (AccountType.Corr.equalsByKey(accountType.getCode())) return null; - return AccountError.WrongFieldValue; - }) + false +// accountType -> { +// if (AccountType.Corr.equalsByKey(accountType.getCode())) return null; +// return AccountError.WrongFieldValue; +// } + ) ); }; } diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java index 786fc475e..758557528 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java @@ -163,6 +163,10 @@ public class AccountService extends QueueConsumer implements InitializingBean { CorrespondentAccountUpdateRequest request = userRequest.getRequestPayload(); Account account = accountMap.getSingleObjectByID(request.getId()); + if (request.getAccountType() != null && !request.getAccountType().equals(account.getAccountType())) { + requestInfoUpdate = makeError(userRequest.getId(), AccountError.WrongFieldValue, "accountType"); + return requestInfoUpdate; + } if (request.getStatus() != null) account.setStatus(request.getStatus());