Merge branch 'developer' into 'master'

test

See merge request !962

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

@@ -487,7 +487,7 @@ public class StaffController extends WebBaseController {
         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) {
+        if(needDep) {
             departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
         }
         List<StaffDTO> staffAllList = Lists.newArrayListWithCapacity(5000);