From e81a1fda06453bcd33cac505ffc04db59eb07b96 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Thu, 11 Jun 2026 15:29:52 +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 --- .../application/service/UserShipperApplicationService.java | 5 ++++- .../domain/userAggregate/repository/todo/UserShipperDO.java | 3 +++ .../src/main/resources/mapper/UserShipperMapper.xml | 2 +- 3 files changed, 8 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 8b4b85d55..5ebe1bcf3 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 @@ -138,7 +138,10 @@ public class UserShipperApplicationService { } UserPo userPo = loginUser.getUserPo(); - + + // 设置 LEFT JOIN 用的组织ID（始终是当前登录用户组织，不参与 WHERE 过滤） + userShipperDO.setPushQueryOrgId(userPo.getOrganizationId()); + // 先保存前端传递的 organizationId（如果存在） Long frontendOrganizationId = userShipperDO.getOrganizationId(); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java index e9f0b6386..ce40f7353 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java @@ -304,6 +304,9 @@ public class UserShipperDO extends UserDO { @ApiModelProperty("更新时间止") private String updateTimeTo; + /** LEFT JOIN business_partner_push_log 用，存当前登录用户组织ID，不参与 WHERE 过滤 */ + private Long pushQueryOrgId; + @ApiModelProperty("推送状态") private Integer pushStatus; diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index cbde44994..eb04fdb17 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -169,7 +169,7 @@ pl.push_by_name FROM "USER" a LEFT JOIN user_shipper b ON a.user_id = b.user_id - LEFT JOIN business_partner_push_log pl ON pl.shipper_id = b.shipper_id AND pl.organization_id = #{organizationId} + LEFT JOIN business_partner_push_log pl ON pl.shipper_id = b.shipper_id AND pl.organization_id = #{pushQueryOrgId} left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1