diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java index 1b795ee56..f7385a0db 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java @@ -117,7 +117,7 @@ public class ClientCodeValidationConfig { Account.class, AccountError.RequiredFieldEmpty, AccountError.AccountNotFound, - true, + false, acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId()) ? null : AccountError.AccountNotFound ), diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java index b78f2f0d1..7f4b35960 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java @@ -43,7 +43,9 @@ public enum BackendClientCodeValidationRule implements IValidationRule currencyIds = validatedObject.getCurrencyAccountList(); Long moneyAccountId = validatedObject.getMoneyAccountId(); - + if (moneyAccountId == null) { + return empty(); + } Imdg tradingClearingRegistryImdg = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class); Imdg tradingClearingRegistryListImdg = @@ -58,6 +60,9 @@ public enum BackendClientCodeValidationRule implements IValidationRule