From bdc4f3fb675c92ce4e76638d89974b79cd1bf8b0 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Wed, 23 Aug 2023 14:50:46 +0300
Subject: [PATCH] =?UTF-8?q?FormingPaymentInstructionSecurities=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=83=D1=81=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B5=20sessionId=20=D0=B4=D0=BB=D1=8F=20=D1=81?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=BE=D0=BA=20=D0=BF=D0=BE=20=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8C=D0=B3=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FormingPaymentInstructionSecurities.java     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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<Registry> selectMoneyRegistries() {
+    private Collection<Registry> selectMoneyRegistries(Long sessionId) {
         ImdgPredicateBuilder rgsPb = registryImdg.predicateBuilder();
         RegistryCodeSqlBuilder registryCodeSqlBuilder = RegistryCodeSqlBuilder.getInstance(
                 AM_B
         );
-        ImdgPredicate rgsCodePrdct = rgsPb.sql(registryCodeSqlBuilder.build());
-        Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(rgsCodePrdct);
+        ImdgPredicate prdct = rgsPb.and(
+                rgsPb.sql(registryCodeSqlBuilder.build()),
+                rgsPb.equals("sessionId", sessionId)
+        );
+        Collection<Registry> 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<Registry> registries = selectMoneyRegistries();
+            Collection<Registry> 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'"