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 | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 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 dae18f3..f4ca4a2 100644 --- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java +++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java @@ -7,6 +7,7 @@ import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; +import com.core.common.DateUtils; import com.core.common.R; import com.core.domain.KeyValueVo; import com.core.exception.CoolException; @@ -18,9 +19,11 @@ import com.zy.crm.manager.service.CstmrFollService; import com.zy.crm.manager.service.CstmrService; import com.zy.crm.manager.service.CstmrTypeService; +import com.zy.crm.system.entity.Dept; import com.zy.crm.system.entity.Dic; import com.zy.crm.system.entity.Role; import com.zy.crm.system.entity.User; +import com.zy.crm.system.service.DeptService; import com.zy.crm.system.service.DicService; import com.zy.crm.system.service.UserService; import lombok.extern.slf4j.Slf4j; @@ -51,6 +54,8 @@ private CstmrTypeService cstmrTypeService; @Autowired private DicService dicService; + @Autowired + private DeptService deptService; @RequestMapping(value = "/cstmr/{id}/auth") @ManagerAuth @@ -62,13 +67,28 @@ @ManagerAuth public R page(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, + @RequestParam(required = false) String conditionName, @RequestParam(required = false) String condition, @RequestParam(required = false, value = "dept_id") Long deptId, @RequestParam(required = false, value = "user_id") Long userId){ - return R.ok(cstmrService.getPage(new Page<>(curr, limit) + if (!Cools.isEmpty(conditionName)){ + switch (conditionName){ + case "director": + try { + condition=userService.selectOne(new EntityWrapper<User>().eq("username", condition)).getId().toString(); + }catch (Exception e){ + conditionName = null; + } + break; + default: + + } + } + return R.ok(cstmrService.getPage1(new Page<>(curr, limit) , getHostId() , deptId == null ? null : String.valueOf(deptId) , userId == null ? getUserId() : userId + , conditionName , condition) ); } @@ -115,14 +135,7 @@ return R.ok(); } - @RequestMapping(value = "/cstmr/delete/json") - @ManagerAuth - public R deleteJson(@RequestBody() Map map){ - Object ids = map.get("ids"); - ----------------------- - System.out.println(ids); - return R.ok(); - } + @RequestMapping(value = "/cstmrQuery/auth") @ManagerAuth -- Gitblit v1.9.1