From 59aa30411c66a7338adea980a373a475b799dff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Tue, 24 Mar 2026 16:23:01 +0800
Subject: [PATCH] =?UTF-8?q?tms3.24=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/UserApplicationService.java       | 22 +++++++++----------
 .../UserShipperApplicationService.java        |  3 +++
 .../organization/OrganizationMapper.xml       |  6 ++++-
 3 files changed, 19 insertions(+), 12 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 139346b6d..c20e097e4 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
@@ -5063,18 +5063,18 @@ public class UserApplicationService {
         
         // 数据隔离：根据 organizationId 字段来实现
         // 如果当前登录用户的organizationId为2827，可查询全部组织数据；其他组织只能查询自己组织的数据
-        if (loginUserOrganizationId != null && loginUserOrganizationId.equals(2827L)) {
+//        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();
-            }
-        }
+//            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);
     }
 
diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
index f4754d286..54a97909f 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
@@ -163,6 +163,9 @@ public class UserShipperApplicationService {
                     log.warn("托运人列表查询 - 前端传递的组织ID {} 与当前登录用户的组织ID {} 不一致，使用当前登录用户的组织ID进行过滤", 
                         frontendOrganizationId, loginUserOrganizationId);
                     userShipperDO.setOrganizationId(loginUserOrganizationId);
+                    if (frontendOrganizationId.equals(2827L)){
+                        userShipperDO.setOrganizationId(null);
+                    }
                 } else {
                     // 前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值
                     userShipperDO.setOrganizationId(frontendOrganizationId);
diff --git a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml
index 8f1d16aab..781fcaf0f 100644
--- a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml
+++ b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml
@@ -96,7 +96,11 @@
             o1.receiving_bank,
             o1.receiving_number,
             o1.interbank_number,
-            o1.template_seal
+            o1.template_seal,
+            o1.company_name,
+            o1.company_name_en,
+            o1.contact,
+            o1.contact_phone
         FROM
             sys_organization o1
                 LEFT JOIN