diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java index 3c6b00d6e..4b5693806 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java @@ -53,6 +53,7 @@ public class BankAccountValidationConfig { Company.class, AccountError.RequiredFieldEmpty, AccountError.CompanyNotFound, + false, company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive), FieldRequiredRule.instance("account", BankAccountNewRequest::getAccount, @@ -83,9 +84,6 @@ public class BankAccountValidationConfig { AccountError.RequiredFieldEmpty), FieldRequiredRule.instance("bankName", BankAccountNewRequest::getBankName, - AccountError.RequiredFieldEmpty), - FieldRequiredRule.instance("destination", - BankAccountNewRequest::getDestination, AccountError.RequiredFieldEmpty) ); }; diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java index 995367116..62643e3de 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/rule/HaveValidCodeByDictionary.java @@ -38,7 +38,7 @@ public class HaveValidCodeByDictionary implements IValidationRule imdgDictionary = context.obtainMap(mapName, SpcexObjectBase.class); SpcexObjectBase dictionary = imdgDictionary.getSingleObjectByFieldValues(Map.of(