修改商业合作伙伴推送-各组织独立问题

mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java

@@ -201,7 +201,25 @@ public class UserShipperApplicationService {
         List<UserShipperPo> userShipperList = userShipperDomainService.userShipperList(userShipperDO);
         return processShipperList(userShipperList);
     }
-    
+
+    /**
+     * 商业合作伙伴列表查询 - 不分组织过滤，所有组织数据都能查到
+     */
+    @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);
+        }
+        userShipperDO.setPushQueryOrgId(loginUser.getUserPo().getOrganizationId());
+        // 不做任何组织权限过滤，前端传了 org 就按 org 查，没传就看全部
+        log.info("托运人列表查询（所有组织）- organizationId={}", userShipperDO.getOrganizationId());
+        List<UserShipperPo> userShipperList = userShipperDomainService.userShipperList(userShipperDO);
+        return processShipperList(userShipperList);
+    }
+
     /**
      * 处理托运人列表，填充网货平台数据
      */

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<UserShipperPo> list = userShipperApplicationService.userShipperList(userShipperDO);
+        List<UserShipperPo> list = userShipperApplicationService.userShipperListAllOrgs(userShipperDO);
         return getDataTable(list);
     }