From 8a463f52fccd98ab2fd5f2dc17128939dcbcb03b Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Thu, 11 Jun 2026 14:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E4=B8=9A=E5=90=88?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=99=E4=BC=B4=E6=8E=A8=E9=80=81-=E5=90=84?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=8B=AC=E7=AB=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/gwLog/GwLogApplicationService.java  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/gwLog/GwLogApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/gwLog/GwLogApplicationService.java
index a7438a62b..0d373d391 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/gwLog/GwLogApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/gwLog/GwLogApplicationService.java
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.Map;
 
 @Service
@@ -55,8 +56,20 @@ public class GwLogApplicationService {
         if(po1.isEmpty()){
             return null;
         }
-        GwLogPO po = po1.get(0);
-        return po;
+        // 商业合作伙伴按组织隔离，只返回当前组织的报文
+        if ("商业合作伙伴".equals(gwLog.getType())) {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser != null && loginUser.getUserPo() != null) {
+                Long orgId = loginUser.getUserPo().getOrganizationId();
+                po1 = po1.stream()
+                        .filter(p -> orgId.equals(p.getOrganizationId()))
+                        .collect(Collectors.toList());
+            }
+        }
+        if(po1.isEmpty()){
+            return null;
+        }
+        return po1.get(0);
     }
 
     public AjaxResult insertGwLog(GwLogDTO gwLogDTO) {