From 721710252e5c0084dcd3bb153d28902d0bb4b14e Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Thu, 11 Jun 2026 19:31:29 +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 --- .../UserShipperApplicationService.java | 20 ++++++++++++++++++- .../interfaces/facade/UserShipperAPI.java | 2 +- 2 files changed, 20 insertions(+), 2 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 5ebe1bcf3..83e42f22e 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 @@ -201,7 +201,25 @@ public class UserShipperApplicationService { List userShipperList = userShipperDomainService.userShipperList(userShipperDO); return processShipperList(userShipperList); } - + + /** + * 商业合作伙伴列表查询 - 不分组织过滤，所有组织数据都能查到 + */ + @NeedSetValueMethod + public List userShipperListAllOrgs(UserShipperDO userShipperDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser == null || loginUser.getUserPo() == null) { + log.warn("托运人列表查询（所有组织）- 未获取到登录用户信息"); + List userShipperList = userShipperDomainService.userShipperList(userShipperDO); + return processShipperList(userShipperList); + } + userShipperDO.setPushQueryOrgId(loginUser.getUserPo().getOrganizationId()); + // 不做任何组织权限过滤，前端传了 org 就按 org 查，没传就看全部 + log.info("托运人列表查询（所有组织）- organizationId={}", userShipperDO.getOrganizationId()); + List userShipperList = userShipperDomainService.userShipperList(userShipperDO); + return processShipperList(userShipperList); + } + /** * 处理托运人列表，填充网货平台数据 */ diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserShipperAPI.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserShipperAPI.java index 8aa5b2879..51aaca364 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserShipperAPI.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserShipperAPI.java @@ -268,7 +268,7 @@ public class UserShipperAPI extends BaseController { //转换实体 UserShipperDO userShipperDO = userShipperAssember.toUserShipperDO(userShipperDTO); PageHelper.startPage(pageNo, pageSize); - List list = userShipperApplicationService.userShipperList(userShipperDO); + List list = userShipperApplicationService.userShipperListAllOrgs(userShipperDO); return getDataTable(list); }