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) {