导出

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

@@ -471,7 +471,6 @@ 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();
-        List<String> departmentIds = new ArrayList<>();
         boolean needDep = true ;
         if(StringUtils.isBlank(departmentId)){
             needDep = false ;
@@ -482,6 +481,7 @@ 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());
         }