From 7cfb30e90c72b3e8f71a4fe0eba999a97feda21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 17 Jun 2026 15:58:04 +0800
Subject: [PATCH] =?UTF-8?q?ot=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E6=96=B9=E5=8F=AA=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=BA=BA=E7=BB=84=E7=BB=87=E6=95=B0=E6=8D=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/UserApplicationService.java        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
index 01ee8e0b5..832f860bb 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
@@ -5279,18 +5279,18 @@ public class UserApplicationService {
         
         // 数据隔离：根据 organizationId 字段来实现
         // 如果当前登录用户的organizationId为2827，可查询全部组织数据；其他组织只能查询自己组织的数据
-//        if (loginUserOrganizationId != null && loginUserOrganizationId.equals(2827L)) {
-            // 南光组织：查询所有组织的数据，不设置 organizationId 和 userId 过滤条件
-//            filterOrganizationId = null;
-//            userId = null;
-//        } else {
-//            // 其他组织：只查询自己组织的数据
-//            filterOrganizationId = loginUserOrganizationId;
-//            // 如果当前登录用户是货主或企业用户，只查询当前登录用户的信息
+        if (loginUserOrganizationId != null && loginUserOrganizationId.equals(2827L)) {
+//             南光组织：查询所有组织的数据，不设置 organizationId 和 userId 过滤条件
+            filterOrganizationId = null;
+            userId = null;
+        } else {
+            // 其他组织：只查询自己组织的数据
+            filterOrganizationId = loginUserOrganizationId;
+            // 如果当前登录用户是货主或企业用户，只查询当前登录用户的信息
 //            if(loginUser.getUserPo().getBusinessType()==1||loginUser.getUserPo().getBusinessType()==3||loginUser.getUserPo().getUserAccountType()==5){
 //                userId = loginUser.getUserid();
 //            }
-//        }
+        }
         return userDomainService.findAllShipperInfo(userId, filterOrganizationId);
     }