|
|
@@ -84,7 +84,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
|
|
|
// 根据用户的部门树展示级别查询相应的部门树
|
|
|
switch (treeShowLevel.getShowLevel()) {
|
|
|
case "all":
|
|
|
- treeByShowLevel = findTreeByShowLevel("9", managementSource, "all");
|
|
|
+ treeByShowLevel = findTreeByShowLevel(deptId, managementSource, "all");
|
|
|
break;
|
|
|
case "same":
|
|
|
treeByShowLevel = findTreeByShowLevel(deptId, managementSource, "same");
|
|
|
@@ -122,6 +122,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
|
|
|
if (resultTmp.size() == 0) {
|
|
|
break;
|
|
|
} else {
|
|
|
+ int finalLevel = level;
|
|
|
+ resultTmp = resultTmp.stream().filter(x->x.getComlevel().equals(String.valueOf(finalLevel))).collect(Collectors.toList());
|
|
|
result.clear();
|
|
|
result.addAll(resultTmp);
|
|
|
}
|