diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java index 4c43846bc..1d6394bfd 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java @@ -165,6 +165,10 @@ public interface UserServiceFeign { @GetMapping("/userShipperApi/userShipperListAll") public AjaxResult userShipperListAll(); + @ApiOperation("查询租户下全部托运人") + @GetMapping("/userShipperApi/userShipperListAllByOrg") + public AjaxResult userShipperListAllByOrg(@RequestParam("orgCode") Long orgCode); + @ApiOperation("查询租户下全部承运人") @GetMapping("/userDriverApi/userDriverListAll") public AjaxResult userDriverListAll(); 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 a73ad76d5..b84ff3401 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 @@ -1306,6 +1306,12 @@ public class UserShipperApplicationService { return userShipperDomainService.userShipperList(userShipperDO); } + public List userShipperListAllByOrg(Long orgCode) { + UserShipperDO userShipperDO = new UserShipperDO(); + userShipperDO.setOrganizationId(orgCode); + return userShipperDomainService.userShipperList(userShipperDO); + } + /** * E签宝回调接口-认证授权完成 * @param jsonObject 回调参数 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 39144e917..41ae750a4 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 @@ -212,6 +212,15 @@ public class UserShipperAPI extends BaseController { return AjaxResult.success("操作成功",list); } + @Log(title = "托运人管理-查询租户下所有托运人", description ="查询租户下所有托运人",businessType = BusinessType.INQUIRE) + @ApiOperation("查询租户下所有托运人") + @GetMapping("/userShipperListAllByOrg") + public AjaxResult userShipperListAllByOrg(@RequestParam("orgCode") Long orgCode) { + //转换实体 + List list = userShipperApplicationService.userShipperListAllByOrg(orgCode); + return AjaxResult.success("操作成功",list); + } + @Log(title = "托运人管理-修改授权额度 结算天数 使用额度", description ="修改授权额度 结算天数 使用额度",businessType = BusinessType.INQUIRE) @ApiOperation("修改授权额度和结算天数") @PutMapping("/settlementInfo") diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java index dd3dd498f..76879467f 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java @@ -274,7 +274,7 @@ public class SettlementCustomersApplicationService { SyncDictCache dictCache, List toInsert, List toUpdate) { - AjaxResult ajaxResult = userServiceFeign.userShipperListAll(); + AjaxResult ajaxResult = userServiceFeign.userShipperListAllByOrg(loginUser.getUserPo().getOrganizationId()); List userShipperPoList = parseFeignList(ajaxResult, UserShipperPo.class); if (userShipperPoList.isEmpty()) { return;