导出部门字段为null问题处理

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

@@ -476,9 +476,7 @@ public class StaffController extends WebBaseController {
     public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, String permitState,BasePageInfo pageInfo) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        boolean needDep = true ;
         if(StringUtils.isBlank(departmentId)){
-            needDep = false ;
             DepartmentDTO dto = this.departmentApiService.getRootByEnterpriseId(wxEnterpriseId) ;
             departmentId = dto.getDepartmentId() ;
         }
@@ -486,10 +484,8 @@ public class StaffController extends WebBaseController {
         departmentIdSet.add(departmentId);
         List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
         Map<String, DepartmentDTO>  departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s));
-        List<String> departmentIds = new ArrayList<>();
-        if(needDep) {
-            departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
-        }
+        List<String> departmentIds ;
+        departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
         List<StaffDTO> staffAllList = Lists.newArrayListWithCapacity(5000);
         pageInfo.setPageSize(Integer.MAX_VALUE);
         int pageNum = 1;