From 9be598529b54f4810f396546be272c444fbbbaf7 Mon Sep 17 00:00:00 2001
From: mzr <1562242162@qq.com>
Date: Thu, 15 May 2025 18:29:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(stock):=20=E5=A2=9E=E5=8A=A0=E8=90=A5?=
 =?UTF-8?q?=E9=94=80=E5=8C=BA=E5=9F=9F=E5=8F=82=E6=95=B0=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 StockReportApi 和 StockReportController 中添加 areaId 参数，用于筛选营销区域
- 修改 roleUtiles 方法调用，传入 areaId 参数，以实现更精确的权限控制
---
 .../src/main/java/com/yb/lb/webapp/stock/StockReportApi.java   | 3 ++-
 .../java/com/yb/lb/webapp/stock/StockReportController.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportApi.java b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportApi.java
index 8a3f722..61b23f2 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportApi.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportApi.java
@@ -51,6 +51,7 @@ public class StockReportApi extends BaseController {
             @ApiParam(required = false, value = "规格") @RequestParam(required = false) String specifications,
             @ApiParam(required = false, value = "开始日期") @RequestParam(required = false) String startDate,
             @ApiParam(required = false, value = "结束日期") @RequestParam(required = false) String endDate,
+            @ApiParam(required = false, value = "营销区域id") @RequestParam(required = false) String areaId,
             @ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(value = "page") Integer pageNum,
             @ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize,
             HttpServletRequest request) {
@@ -60,7 +61,7 @@ public class StockReportApi extends BaseController {
         if (!redisService.exists(token)) {
             return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
         }
-        params = roleDateUtils.roleUtiles(token, "", "", "");
+        params = roleDateUtils.roleUtiles(token, areaId, "", "");
         if ("0".equals(params.get("code"))) {
             return AjaxResult.error(ErrorUtils.USERNAME_POWER_ERROR, "无权查看");
         }
diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
index 8640d3c..a9bd575 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
@@ -61,6 +61,7 @@ public class StockReportController extends BaseController {
             @ApiParam(required = false, value = "发起开始日期") @RequestParam(required = false) String startTime,
             @ApiParam(required = false, value = "发起开始日期") @RequestParam(required = false) String endTime,
             @ApiParam(required = false, value = "结束日期") @RequestParam(required = false) String endDate,
+            @ApiParam(required = false, value = "营销区域id") @RequestParam(required = false) String areaId,
             @ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(value = "page") Integer pageNum,
             @ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize,
             HttpServletRequest request) {
@@ -70,7 +71,7 @@ public class StockReportController extends BaseController {
         if (!redisService.isKey(token)) {
             return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
         }
-        params = roleDateUtils.roleUtiles(token, "", "", "");
+        params = roleDateUtils.roleUtiles(token, areaId, "", "");
         if ("0".equals(params.get("code"))) {
             return AjaxResult.error(ErrorUtils.USERNAME_POWER_ERROR, "无权查看");
         }