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 d0948370d..70a80e587 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 @@ -274,10 +274,17 @@ public class PaymentInstructionBuilderV2 { } public boolean categoryIOrVInitiator(Long companyId) { - ClearingMemberCategory category = clearingCategoryImdg.getFirstObjectByFieldValues( + Collection categories = clearingCategoryImdg.getCollectionObjectsByFieldValues( Map.of("companyId", companyId)); - ClearingCategory ctg = IEnumKey.getEnumByKey(ClearingCategory.class, category.getClearingMemberCategory()); - return ctg != null && (ctg.equals(ClearingCategory.V) || ctg.equals(ClearingCategory.I)) ; + boolean result = false; + for (ClearingMemberCategory category : categories) { + log.debug("Found category.clearingMemberCategory: {} by companyId: {}", + category.getClearingMemberCategory(), + companyId); + ClearingCategory ctg = IEnumKey.getEnumByKey(ClearingCategory.class, category.getClearingMemberCategory()); + result = result | ctg != null && (ctg.equals(ClearingCategory.V) || ctg.equals(ClearingCategory.I)); + } + return result; } public boolean companyRoleODEPPresent(Long companyId) {