|
@@ -78,13 +78,17 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
|
|
|
}
|
|
}
|
|
|
// 如果指定的部门ID为空或特定值,则使用当前用户所在部门ID
|
|
// 如果指定的部门ID为空或特定值,则使用当前用户所在部门ID
|
|
|
if (null == deptId || "".equals(deptId) || "undefined".equals(deptId)) {
|
|
if (null == deptId || "".equals(deptId) || "undefined".equals(deptId)) {
|
|
|
- deptId = user.getDeptId();
|
|
|
|
|
|
|
+ if(!treeShowLevel.getShowLevel().equals("all")) {
|
|
|
|
|
+ deptId = user.getDeptId();
|
|
|
|
|
+ }else{
|
|
|
|
|
+ deptId = "9";
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 根据用户的部门树展示级别查询相应的部门树
|
|
// 根据用户的部门树展示级别查询相应的部门树
|
|
|
switch (treeShowLevel.getShowLevel()) {
|
|
switch (treeShowLevel.getShowLevel()) {
|
|
|
case "all":
|
|
case "all":
|
|
|
- treeByShowLevel = findTreeByShowLevel("9", managementSource, "all");
|
|
|
|
|
|
|
+ treeByShowLevel = findTreeByShowLevel(deptId, managementSource, "all");
|
|
|
break;
|
|
break;
|
|
|
case "same":
|
|
case "same":
|
|
|
treeByShowLevel = findTreeByShowLevel(deptId, managementSource, "same");
|
|
treeByShowLevel = findTreeByShowLevel(deptId, managementSource, "same");
|