|
|
@@ -149,7 +149,9 @@ public class CompanyUserController extends BaseController {
|
|
|
combinedDpetList.add(deptId);
|
|
|
}
|
|
|
//本部门的下级部门
|
|
|
- List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|
|
|
+ //List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|
|
|
+ //本部门的全部下级部门
|
|
|
+ List<Long> deptList = companyDeptService.getCurrentDeptIdDownTreeIds(deptId);
|
|
|
if (!deptList.isEmpty()){
|
|
|
combinedDpetList.addAll(deptList);
|
|
|
}
|
|
|
@@ -576,7 +578,9 @@ public class CompanyUserController extends BaseController {
|
|
|
combinedList.add(deptId);
|
|
|
}
|
|
|
//本部门的下级部门
|
|
|
- List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|
|
|
+ //List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|
|
|
+ //本部门的全部下级部门
|
|
|
+ List<Long> deptList = companyDeptService.getCurrentDeptIdDownTreeIds(deptId);
|
|
|
if (!deptList.isEmpty()){
|
|
|
combinedList.addAll(deptList);
|
|
|
}
|
|
|
@@ -672,7 +676,9 @@ public class CompanyUserController extends BaseController {
|
|
|
}
|
|
|
|
|
|
//本部门的下级部门
|
|
|
- List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|
|
|
+ //List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|
|
|
+ //本部门的全部下级部门
|
|
|
+ List<Long> deptList = companyDeptService.getCurrentDeptIdDownTreeIds(deptId);
|
|
|
if (!deptList.isEmpty()){
|
|
|
combinedDeptList.addAll(deptList);
|
|
|
}
|