From 04d24f1c11f7a3aab94cc5be144d4f469bb704e3 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Thu, 11 Jun 2026 20:40:50 +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/UserShipperApplicationService.java        | 11 ++++-------
 .../repository/mapper/UserShipperMapper.java          |  2 ++
 .../src/main/resources/mapper/UserShipperMapper.xml   |  8 ++++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

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 83e42f22e..bc84b75d8 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
@@ -208,15 +208,12 @@ public class UserShipperApplicationService {
     @NeedSetValueMethod
     public List<UserShipperPo> userShipperListAllOrgs(UserShipperDO userShipperDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser == null || loginUser.getUserPo() == null) {
-            log.warn("托运人列表查询（所有组织）- 未获取到登录用户信息");
-            List<UserShipperPo> userShipperList = userShipperDomainService.userShipperList(userShipperDO);
-            return processShipperList(userShipperList);
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            userShipperDO.setPushQueryOrgId(loginUser.getUserPo().getOrganizationId());
         }
-        userShipperDO.setPushQueryOrgId(loginUser.getUserPo().getOrganizationId());
-        // 不做任何组织权限过滤，前端传了 org 就按 org 查，没传就看全部
         log.info("托运人列表查询（所有组织）- organizationId={}", userShipperDO.getOrganizationId());
-        List<UserShipperPo> userShipperList = userShipperDomainService.userShipperList(userShipperDO);
+        // 直接走新 mapper 查询，不做组织权限过滤
+        List<UserShipperPo> userShipperList = userShipperMapper.selectListAllOrgs(userShipperDO);
         return processShipperList(userShipperList);
     }
 
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java
index 1dcfce572..2800c72df 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java
@@ -15,6 +15,8 @@ public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
 
     List<UserShipperPo> selectList(UserShipperDO userShipperDO);
 
+    List<UserShipperPo> selectListAllOrgs(UserShipperDO userShipperDO);
+
     UserShipperPo selectByUserId(Long userId);
 
     UserShipperPo findByShipperId(Long shipperId);
diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
index eb04fdb17..c66b57cf8 100644
--- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
@@ -190,6 +190,14 @@
         ORDER BY a.create_time DESC
     </select>
 
+    <select id="selectListAllOrgs" parameterType="com.mhd.user.domain.userAggregate.repository.todo.UserShipperDO"
+            resultType="com.mhd.user.domain.userAggregate.repository.po.UserShipperPo">
+        <include refid="selectShipperVo1"/>
+        <include refid="common_where"></include>
+        GROUP BY  a.user_id
+        ORDER BY a.create_time DESC
+    </select>
+
     <select id="selectByUserId" parameterType="java.lang.Long"
             resultType="com.mhd.user.domain.userAggregate.repository.po.UserShipperPo">
         <include refid="selectShipperVo"/>