diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecurities.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecurities.java index c64deee1d..d7891c4ed 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecurities.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionSecurities.java @@ -122,13 +122,16 @@ public class FormingPaymentInstructionSecurities implements ISessionStage { .collect(Collectors.toList()); } - private Collection selectMoneyRegistries() { + private Collection selectMoneyRegistries(Long sessionId) { ImdgPredicateBuilder rgsPb = registryImdg.predicateBuilder(); RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance( AM_B ); - ImdgPredicate rgsCodePrdct = rgsPb.sql(registryCodeSqlBuilder.build()); - Collection registries = registryImdg.getCollectionObjectsByPredicate(rgsCodePrdct); + ImdgPredicate prdct = rgsPb.and( + rgsPb.sql(registryCodeSqlBuilder.build()), + rgsPb.equals("sessionId", sessionId) + ); + Collection registries = registryImdg.getCollectionObjectsByPredicate(prdct); return registries.stream() .filter(rgs -> Objects.equals(rgs.getValueDate(), rgs.getSettlementDate())) .collect(Collectors.toList()); @@ -227,7 +230,7 @@ public class FormingPaymentInstructionSecurities implements ISessionStage { } } { - Collection registries = selectMoneyRegistries(); + Collection registries = selectMoneyRegistries(sessionId); Account tranAcc = accountImdg.getFirstObjectBySQL("accountType = '%s' and status = '%s' and processingSign = '%s'" .formatted(AccountType.Tran.getKey(), AccountStatus.ACTIVE.getKey(), Allowed.ALLOWED.getKey())); Account dtrnAcc = accountImdg.getFirstObjectBySQL("accountType = '%s' and status = '%s' and processingSign = '%s'"