|
@@ -66,14 +66,13 @@ public class SysDeptServiceImpl implements ISysDeptService {
|
|
|
if (!String.valueOf(loginUser.getUserId()).equals("1")) {
|
|
|
List<Integer> deptList = new ArrayList<>();
|
|
|
//获取到子孙级部门id
|
|
|
- //Integer deptId = Math.toIntExact(loginUser.getDeptId());
|
|
|
- //if (deptService.hasChildByDeptId(loginUser.getDeptId())) {
|
|
|
- // List<Integer> children = deptService.getDeptChildren(deptId);
|
|
|
- // System.err.println(children.size());
|
|
|
- // deptList.addAll(children);
|
|
|
- // deptList.add(deptId);
|
|
|
- deptList.add(228);
|
|
|
- deptList.add(229);
|
|
|
+ Integer deptId = Math.toIntExact(loginUser.getDeptId());
|
|
|
+ if (deptService.hasChildByDeptId(loginUser.getDeptId())) {
|
|
|
+ List<Integer> children = deptService.getDeptChildren(deptId);
|
|
|
+ System.err.println(children.size());
|
|
|
+ deptList.addAll(children);
|
|
|
+ }
|
|
|
+ deptList.add(deptId);
|
|
|
dept.setDeptList(deptList);
|
|
|
}
|
|
|
if (!ObjectUtils.isEmpty(dept.getDeptList())) {
|