From fee6396d681c4fa992565247d8f0663ec778974a Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 5 Jul 2023 08:16:44 +0800 Subject: [PATCH] update --- .../pile/OrderBasicInfoController.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index b9db828b0..78b0822fc 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -77,8 +77,20 @@ public class OrderBasicInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('order:order:list')") @GetMapping("/order/totalData") - public AjaxResult getOrderTotalData(QueryOrderDTO orderBasicInfo) { - return AjaxResult.success(orderBasicInfoService.getOrderTotalData(orderBasicInfo)); + public AjaxResult getOrderTotalData(QueryOrderDTO dto) { + // 权限过滤 + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + if (authorizedMap == null) { + // 为空表示没有权限，返回空数组 + return new AjaxResult(); + } + String deptId = authorizedMap.getDeptId(); + // 根据部门id查询merchantId + PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); + if (pileMerchantInfo != null) { + dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); + } + return AjaxResult.success(orderBasicInfoService.getOrderTotalData(dto)); } /**