From 07fcb01a51bf4b9102b41e9223d66b16af9548f8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期六, 19 十一月 2022 10:09:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/CstmrController.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 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 09ed9c0..0f3ea78 100644 --- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java +++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java @@ -10,6 +10,7 @@ import com.core.common.R; import com.core.domain.KeyValueVo; import com.core.exception.CoolException; +import com.zy.crm.common.model.enums.RoleType; import com.zy.crm.common.web.BaseController; import com.zy.crm.manager.controller.result.FollowerTableVo; import com.zy.crm.manager.entity.Cstmr; @@ -19,6 +20,7 @@ import com.zy.crm.manager.service.CstmrService; import com.zy.crm.manager.service.CstmrTypeService; 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.DicService; import com.zy.crm.system.service.UserService; @@ -315,9 +317,15 @@ @RequestMapping("/cstmr/all/get/kv") @ManagerAuth public R getDataKV(@RequestParam(required = false) String condition) { + User user = getUser(); assert user != null; + Role role = getRole(); assert role != null; + Page<Cstmr> page = cstmrService.getPage(new Page<>(1, 30) + , getHostId() + , (role.getCode().equals(RoleType.boss.toString()) || role.getCode().equals(RoleType.manager.toString())) ? String.valueOf(user.getDeptId()) : null + , user.getId() + , condition); List<KeyValueVo> vos = new ArrayList<>(); - Wrapper<Cstmr> wrapper = new EntityWrapper<Cstmr>().andNew().like("name", condition).or().like("uuid", condition).orderBy("create_time", false); - cstmrService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId()))); + page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId()))); return R.ok().add(vos); } -- Gitblit v1.9.1