diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java index fc39d34a9..e7e25e8d2 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java @@ -23,6 +23,9 @@ public class AccountActiveValidationRule implements IValidationRule validate(ImdgValidationContext context) { Registry validatedObject = context.getValidatedObject(); Imdg accImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class); + if (validatedObject.getAccountId() == null) { + return of(ClearingError.AccountNotActive, validatedObject.getAccountId()); + } Account account = accImdg.getSingleObjectByID(validatedObject.getAccountId()); if (account == null || (!IEnumKey.contains(account.getStatus(), ServiceStatus.Active, ServiceStatus.Reopened))) { return of(ClearingError.AccountNotActive, validatedObject.getAccountId());