java
/
crmproject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(stock): 增加营销区域参数并优化权限判断 

- 在 StockReportApi 和 StockReportController 中添加 areaId 参数，用于筛选营销区域
- 修改 roleUtiles 方法调用，传入 areaId 参数，以实现更精确的权限控制
This commit is contained in:
mzr 2025-05-15 18:29:42 +08:00
parent 11ec6d4839
commit 9be598529b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportApi.java
View File

@ -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 specifications,
@ApiParam(required = false, value = "开始日期") @RequestParam(required = false) String startDate, @ApiParam(required = false, value = "开始日期") @RequestParam(required = false) String startDate,
@ApiParam(required = false, value = "结束日期") @RequestParam(required = false) String endDate, @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 = "1") @RequestParam(value = "page") Integer pageNum,
@ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize, @ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
@ -60,7 +61,7 @@ public class StockReportApi extends BaseController {
if (!redisService.exists(token)) { if (!redisService.exists(token)) {
return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录"); return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
} }
params = roleDateUtils.roleUtiles(token, "", "", ""); params = roleDateUtils.roleUtiles(token, areaId, "", "");
if ("0".equals(params.get("code"))) { if ("0".equals(params.get("code"))) {
return AjaxResult.error(ErrorUtils.USERNAME_POWER_ERROR, "无权查看"); return AjaxResult.error(ErrorUtils.USERNAME_POWER_ERROR, "无权查看");
} }

3
crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
View File

@ -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 startTime,
@ApiParam(required = false, value = "发起开始日期") @RequestParam(required = false) String endTime, @ApiParam(required = false, value = "发起开始日期") @RequestParam(required = false) String endTime,
@ApiParam(required = false, value = "结束日期") @RequestParam(required = false) String endDate, @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 = "1") @RequestParam(value = "page") Integer pageNum,
@ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize, @ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
@ -70,7 +71,7 @@ public class StockReportController extends BaseController {
if (!redisService.isKey(token)) { if (!redisService.isKey(token)) {
return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录"); return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
} }
params = roleDateUtils.roleUtiles(token, "", "", ""); params = roleDateUtils.roleUtiles(token, areaId, "", "");
if ("0".equals(params.get("code"))) { if ("0".equals(params.get("code"))) {
return AjaxResult.error(ErrorUtils.USERNAME_POWER_ERROR, "无权查看"); return AjaxResult.error(ErrorUtils.USERNAME_POWER_ERROR, "无权查看");
} }