From 57fa4c1311a062586e5e5d38d8bcc5901a94f9f8 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 24 七月 2023 14:06:08 +0800 Subject: [PATCH] #保存回退权限3级硬编码 --- src/main/java/com/zy/crm/manager/controller/CstmrController.java | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java index a3d3769..f4ca4a2 100644 --- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java +++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java @@ -70,7 +70,6 @@ @RequestParam(required = false) String conditionName, @RequestParam(required = false) String condition, @RequestParam(required = false, value = "dept_id") Long deptId, - @RequestParam(required = false, value = "role_id") Long roleId, @RequestParam(required = false, value = "user_id") Long userId){ if (!Cools.isEmpty(conditionName)){ switch (conditionName){ @@ -85,18 +84,10 @@ } } -// return R.ok(cstmrService.getPage1(new Page<>(curr, limit) -// , getHostId() -// , deptId == null ? null : String.valueOf(deptId) -// , userId == null ? getUserId() : userId -// , conditionName -// , condition) -// ); - return R.ok(cstmrService.getPage2(new Page<>(curr, limit) + return R.ok(cstmrService.getPage1(new Page<>(curr, limit) , getHostId() - , deptId == null ? userService.selectById(getUserId()).getDeptId() : deptId + , deptId == null ? null : String.valueOf(deptId) , userId == null ? getUserId() : userId - , roleId == null ? userService.selectById(getUserId()).getRoleId() : roleId , conditionName , condition) ); -- Gitblit v1.9.1