导出

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -469,15 +469,20 @@ public class StaffController extends WebBaseController {
      */
     @RequestMapping("staff-export")
     public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, String permitState,BasePageInfo pageInfo) {
-        List<String> departmentIdSet = new ArrayList<>();
-        departmentIdSet.add(departmentId);
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
-        Map<String, DepartmentDTO> departmentMap = new HashMap<>();
         List<String> departmentIds = new ArrayList<>();
-        if(CollectionUtil.isNotEmpty(relationList)){
-            departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s));
+        boolean needDep = true ;
+        if(StringUtils.isBlank(departmentId)){
+            needDep = false ;
+            DepartmentDTO dto = this.departmentApiService.getRootByEnterpriseId(wxEnterpriseId) ;
+            departmentId = dto.getDepartmentId() ;
+        }
+        List<String> departmentIdSet = new ArrayList<>();
+        departmentIdSet.add(departmentId);
+        List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
+        Map<String, DepartmentDTO>  departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s));
+        if(!needDep) {
             departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
         }
         List<StaffDTO> staffAllList = Lists.newArrayListWithCapacity(5000);