通讯录列表导出接口优化

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

@@ -462,11 +462,11 @@ public class StaffController extends WebBaseController {
      * @Description 会员导出
      */
     @RequestMapping("staff-export")
-    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response,StaffListQO qo) {
+    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response,String departmentId, Integer activeFlag, Integer relationFlag,
+                                      String keyWord, String permitState,BasePageInfo pageInfo,@RequestParam(defaultValue = "create_time") String sortField,
+                                      @RequestParam(defaultValue = "desc") String sortType,String enterpriseIdParam) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        String departmentId = qo.getDepartmentId();
-        BasePageInfo pageInfo = qo.getPageInfo();
         if(StringUtils.isBlank(departmentId)){
             DepartmentDTO dto = this.departmentApiService.getRootByEnterpriseId(wxEnterpriseId) ;
             departmentId = dto.getDepartmentId() ;
@@ -478,9 +478,17 @@ public class StaffController extends WebBaseController {
         List<String> departmentIds ;
         departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
         List<StaffDTO> staffAllList = Lists.newArrayListWithCapacity(5000);
-        StaffListDTO dto = EntityUtil.changeEntityByJSON(StaffListDTO.class, qo);
+        StaffListDTO dto = new StaffListDTO();
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setDepartmentIds(departmentIds);
+        dto.setDepartmentId(departmentId);
+        dto.setActiveFlag(activeFlag);
+        dto.setRelationFlag(relationFlag);
+        dto.setKeyWord(keyWord);
+        dto.setPermitState(permitState);
+        dto.setSortField(sortField);
+        dto.setSortType(sortType);
+        dto.setEnterpriseIdParam(enterpriseIdParam);
         pageInfo.setPageSize(Integer.MAX_VALUE);
         int pageNum = 1;
         while (true) {