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, "无权查看"); }