From f91e3a2507c6972fb15d7d91f0d0380dd4be0bef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 19 九月 2022 08:37:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/utils/TreeUtils.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 7c534bb..3f5872a 100644
--- a/src/main/java/com/zy/crm/common/utils/TreeUtils.java
+++ b/src/main/java/com/zy/crm/common/utils/TreeUtils.java
@@ -7,8 +7,10 @@
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;
import com.zy.crm.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
@@ -31,6 +33,8 @@
private DeptService deptService;
@Autowired
private UserService userService;
+ @Autowired
+ private RoleService roleService;
/******************************** 褰掔被鏍� *********************************/
@@ -176,7 +180,7 @@
* 鑾峰彇鏍戝浘鏁版嵁缁撴瀯
*/
@Cacheable(cacheNames="deptUserTree",key="#id")
- public ArrayList<Map<String, Object>> getDeptUserTree(String id, Long hostId){
+ public ArrayList<Map<String, Object>> getDeptUserTree(String id, Long hostId, Long userId){
ArrayList<Map<String, Object>> result = new ArrayList<>();
Dept dept = deptService.selectById(id);
// 涓昏妭鐐�
@@ -188,12 +192,12 @@
// map.put("icon", "layui-icon layui-icon-star-fill");
List<Map<String, Object>> childrens = new ArrayList<>();
map.put("children", childrens);
- dealUserDept(dept, childrens, hostId);
+ dealUserDept(dept, childrens, hostId, userId);
result.add(map);
return result;
}
- public void dealUserDept(Dept parent, List<Map<String, Object>> list, Long hostId) {
+ 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);
@@ -202,7 +206,14 @@
}
List<Dept> depts = deptService.selectList(wrapper);
- List<User> users = userService.getUserByDept(hostId, parent.getId());
+ 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());
+ }
+
for (User user : users) {
Map<String, Object> map = new HashMap<>();
map.put("title", user.getNickname());
@@ -221,7 +232,7 @@
// map.put("icon", "layui-icon layui-icon-star-fill");
List<Map<String, Object>> childrens = new ArrayList<>();
map.put("children", childrens);
- dealUserDept(dept, childrens, hostId);
+ dealUserDept(dept, childrens, hostId, userId);
list.add(map);
}
}
--
Gitblit v1.9.1