From 7ba559ad407623757f1e28f529637d9e840faa80 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Tue, 24 Jun 2025 14:07:56 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-872

---
 .../session/stage/impl/InspectionObligationsV2.java         | 6 ++++--
 .../stage/impl/RequirementsAndObligationCreation.java       | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java
index 73ba32bb0..8b8cd6446 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java
@@ -357,12 +357,14 @@ public class InspectionObligationsV2 implements ISessionStage {
                 return Collections.emptyList();
             }
             ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
+            String groupMarket = groupIdAndSettleDate.get().getFirst().market();
+            ImdgPredicate marketCondition = StringUtils.hasText(groupMarket) ?
+                pb.or(pb.equals("market", groupMarket), pb.isNull("market")) : pb.alwaysTrue();
             return registryImdg.getCollectionObjectsByPredicate(
                 pb.and(
                     pb.and(
                         pb.equals("groupId", groupIdAndSettleDate.get().getFirst().groupId()),
-                        StringUtils.hasText(groupIdAndSettleDate.get().getFirst().market()) ?
-                            pb.equals("market", groupIdAndSettleDate.get().getFirst().market()) : pb.alwaysTrue()
+                        marketCondition
                     ),
                     pb.not(pb.equals("settlementDate", groupIdAndSettleDate.get().getSecond()))
                 )
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java
index 48bd186c6..47e72b956 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import ru.clearing.classes.statics.data.account.Account;
 import ru.clearing.classes.statics.data.account.ClearingAccount;
 import ru.clearing.classes.statics.data.account.DepoAccount;
@@ -412,7 +411,7 @@ public class RequirementsAndObligationCreation implements ISessionStage {
                 pb.equals("settlementDate", settlementDt),
                 pb.equals("sessionId", sessionId),
                 pb.equals("groupId", exchangeExecutionId),
-                StringUtils.hasText(market) ? pb.equals("market", market) : pb.alwaysTrue()
+                pb.or(pb.equals("market", market), pb.isNull("market"))
         );
         Registry rgs = registryImdg.getSingleObjectByPredicate(rgstrPredicate);
         log.trace("rgs.id={} found by: {}", rgs == null ? "'not found'" : rgs.getId(), rgstrPredicate.toString());