From 8d236208458152fc8c3c19a07ffe0abaf3497fea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:48:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 92337c6..5fa5d2a 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -8,17 +8,18 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
-import com.zy.crm.manager.entity.result.KeyValueVo;
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.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;
@@ -312,22 +313,19 @@
return R.ok("鍒犻櫎鎴愬姛");
}
- // xm-select
@RequestMapping("/cstmr/all/get/kv")
@ManagerAuth
- public R getCstmrDataKV(@RequestParam(required = false) String condition) {
- Wrapper<Cstmr> wrapper = new EntityWrapper<Cstmr>()
- .andNew().like("name", condition).or().like("uuid", condition)
- .orderBy("create_time", false);
- List<Cstmr> cstmrs = cstmrService.selectPage(new Page<>(1, 30), wrapper).getRecords();
- List<KeyValueVo> valueVos = new ArrayList<>();
- for (Cstmr cstmr : cstmrs) {
- KeyValueVo vo = new KeyValueVo();
- vo.setName(cstmr.getName());
- vo.setValue(cstmr.getId());
- valueVos.add(vo);
- }
- return R.ok().add(valueVos);
+ 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.judgeLeader() ? String.valueOf(user.getDeptId()) : null
+ , user.getId()
+ , condition);
+ List<KeyValueVo> vos = new ArrayList<>();
+ page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
+ return R.ok().add(vos);
}
}
--
Gitblit v1.9.1