|
@@ -618,6 +618,12 @@ public class CompanyUserController extends BaseController {
|
|
|
Long deptId = loginUser.getUser().getDeptId();
|
|
Long deptId = loginUser.getUser().getDeptId();
|
|
|
if (deptId!=null){
|
|
if (deptId!=null){
|
|
|
combinedDeptList.add(deptId);
|
|
combinedDeptList.add(deptId);
|
|
|
|
|
+
|
|
|
|
|
+ //本部门的上级部门
|
|
|
|
|
+ List<Long> deptList = companyDeptService.selectCompanyDeptByDeptId(deptId);
|
|
|
|
|
+ if (!deptList.isEmpty()){
|
|
|
|
|
+ combinedDeptList.addAll(deptList);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//本部门的下级部门
|
|
//本部门的下级部门
|
|
|
List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|
|
List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
|