Merge remote-tracking branch 'origin/master'

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -28,6 +28,7 @@ import com.fs.company.vo.BatchUserRolesVO;
 import com.fs.company.vo.CompanyUserImportVO;
 import com.fs.company.vo.CompanyUserQwListVO;
 import com.fs.company.vo.CompanyUserVO;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.course.config.CourseConfig;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
@@ -108,6 +109,9 @@ public class CompanyUserController extends BaseController {
     @Autowired
     private IQwUserService qwUserService;
 
+    @Autowired
+    private CloudHostProper cloudHostProper;
+
     private static final String appLink = "https://jump.ylrztop.com/jumpapp/pages/index/index?link=";
 
     /**
@@ -618,7 +622,14 @@ public class CompanyUserController extends BaseController {
         Long deptId = loginUser.getUser().getDeptId();
         if (deptId!=null){
             combinedDeptList.add(deptId);
-        }
+
+                //本部门的上级部门
+                List<Long> deptList = companyDeptService.selectCompanyDeptByDeptId(deptId);
+                if (!deptList.isEmpty()){
+                    combinedDeptList.addAll(deptList);
+                }
+            }
+
         //本部门的下级部门
         List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
         if (!deptList.isEmpty()){