diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java index 14f4c3792..636bdbb23 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java @@ -236,7 +236,7 @@ public class PaymentInstructionBuilderV2 { boolean hasCounterPartyInitiator = false; for (Registry claim : claims) { Long counterPartyId = claim.getCounterPartyId(); - if (categoryVInitiator(counterPartyId) && companyRoleODEPPresent(counterPartyId)) { + if (categoryIOrVInitiator(counterPartyId) && companyRoleODEPPresent(counterPartyId)) { hasCounterPartyInitiator = true; break; } @@ -244,11 +244,11 @@ public class PaymentInstructionBuilderV2 { return hasCounterPartyInitiator; } - public boolean categoryVInitiator(Long companyId) { + public boolean categoryIOrVInitiator(Long companyId) { ClearingMemberCategory category = clearingCategoryImdg.getFirstObjectByFieldValues( Map.of("companyId", companyId)); ClearingCategory ctg = IEnumKey.getEnumByKey(ClearingCategory.class, category.getClearingMemberCategory()); - return ctg != null && ctg.equals(ClearingCategory.V); + return ctg != null && (ctg.equals(ClearingCategory.V) || ctg.equals(ClearingCategory.I)) ; } public boolean companyRoleODEPPresent(Long companyId) {