From 978a3733aedaaa505867b64edfbe1f6caedbc798 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 09:56:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/utils/TreeUtils.java | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/utils/TreeUtils.java b/src/main/java/com/zy/crm/common/utils/TreeUtils.java
index 3f5872a..a370333 100644
--- a/src/main/java/com/zy/crm/common/utils/TreeUtils.java
+++ b/src/main/java/com/zy/crm/common/utils/TreeUtils.java
@@ -182,38 +182,37 @@
@Cacheable(cacheNames="deptUserTree",key="#id")
public ArrayList<Map<String, Object>> getDeptUserTree(String id, Long hostId, Long userId){
ArrayList<Map<String, Object>> result = new ArrayList<>();
- Dept dept = deptService.selectById(id);
- // 涓昏妭鐐�
- Map<String, Object> map = new HashMap<>();
- map.put("title", dept.getName());
- map.put("id", dept.getId());
- map.put("spread", true);
- map.put("key", "dept_id");
-// map.put("icon", "layui-icon layui-icon-star-fill");
- List<Map<String, Object>> childrens = new ArrayList<>();
- map.put("children", childrens);
- dealUserDept(dept, childrens, hostId, userId);
- result.add(map);
+ User user = userService.selectById(userId);
+ Role role = roleService.selectById(user.getRoleId());
+ if (role.getCode().equals("salesman")) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("title", user.getNickname());
+ map.put("id", user.getId());
+ map.put("key", "user_id");
+ map.put("icon", "layui-icon layui-icon-friends");
+ result.add(map);
+ } else {
+ if (role.getId()==1){
+ id="19";
+ }
+ Dept dept = deptService.selectById(id);
+ // 涓昏妭鐐�
+ Map<String, Object> map = new HashMap<>();
+ map.put("title", dept.getName());
+ map.put("id", dept.getId());
+ map.put("spread", true);
+ map.put("key", "dept_id");
+ List<Map<String, Object>> childrens = new ArrayList<>();
+ map.put("children", childrens);
+ dealUserDept(dept, childrens, hostId, userId);
+ result.add(map);
+ }
return result;
}
public void dealUserDept(Dept parent, List<Map<String, Object>> list, Long hostId, Long userId) {
- Wrapper<Dept> wrapper = new EntityWrapper<Dept>()
- .eq("parent_id", parent.getId())
- .eq("status", 1);
- if (hostId != null) {
- wrapper.eq("host_id", hostId);
- }
- List<Dept> depts = deptService.selectList(wrapper);
-
- List<User> users = new ArrayList<>();
- Role role = roleService.selectById(userService.selectById(userId).getRoleId());
- if (role.getCode().equals("salesman")) {
- users.add(userService.selectById(userId));
- } else {
- users = userService.getUserByDept(hostId, parent.getId());
- }
-
+ // 浜哄憳
+ List<User> users = roleService.getUserByRoleCode(hostId, parent.getId(), userId);
for (User user : users) {
Map<String, Object> map = new HashMap<>();
map.put("title", user.getNickname());
@@ -222,14 +221,20 @@
map.put("icon", "layui-icon layui-icon-friends");
list.add(map);
}
-
+ // 閮ㄩ棬
+ Wrapper<Dept> wrapper = new EntityWrapper<Dept>()
+ .eq("parent_id", parent.getId())
+ .eq("status", 1);
+ if (hostId != null) {
+ wrapper.eq("host_id", hostId);
+ }
+ List<Dept> depts = deptService.selectList(wrapper);
for (Dept dept : depts) {
Map<String, Object> map = new HashMap<>();
map.put("title", dept.getName());
map.put("id", dept.getId());
map.put("spread", true);
map.put("key", "dept_id");
-// map.put("icon", "layui-icon layui-icon-star-fill");
List<Map<String, Object>> childrens = new ArrayList<>();
map.put("children", childrens);
dealUserDept(dept, childrens, hostId, userId);
--
Gitblit v1.9.1