From 4d39a74d7118a55897bf521d02016052acace7e6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 13:48:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/utils/TreeUtils.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 4d6cda0..591604d 100644
--- a/src/main/java/com/zy/crm/common/utils/TreeUtils.java
+++ b/src/main/java/com/zy/crm/common/utils/TreeUtils.java
@@ -7,6 +7,7 @@
import com.zy.crm.manager.service.NodeService;
import com.zy.crm.manager.service.TagService;
import com.zy.crm.system.entity.Dept;
+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.RoleService;
@@ -181,17 +182,28 @@
@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");
- 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 {
+ 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;
}
--
Gitblit v1.9.1