Commit 82aa914d by QianQiXiang

根据状态来导出通讯录

parent 94d2b608
...@@ -490,11 +490,6 @@ public class StaffController extends WebBaseController { ...@@ -490,11 +490,6 @@ public class StaffController extends WebBaseController {
pageInfo.setPageNum(pageNum); pageInfo.setPageNum(pageNum);
pageInfo.setPageSize(pageSize); pageInfo.setPageSize(pageSize);
String departmentId = request.getParameter("departmentId"); String departmentId = request.getParameter("departmentId");
String stringActiveFlag = request.getParameter("activeFlag");
Integer activeFlag = null;
if (stringActiveFlag != null) {
activeFlag = Integer.parseInt(stringActiveFlag);
}
List<String> departmentIdSet = new ArrayList<>(); List<String> departmentIdSet = new ArrayList<>();
departmentIdSet.add(departmentId); departmentIdSet.add(departmentId);
LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser(); LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
...@@ -507,13 +502,13 @@ public class StaffController extends WebBaseController { ...@@ -507,13 +502,13 @@ public class StaffController extends WebBaseController {
List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId); List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
Map<String, DepartmentDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s)); Map<String, DepartmentDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s));
List<String> departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList()); List<String> departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, null, pageInfo); Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, null, null, pageInfo);
List<StaffDTO> list = page.getResult(); List<StaffDTO> list = page.getResult();
logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage()); logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage());
while (page.getCurrentPage() < page.getTotalPage()) { while (page.getCurrentPage() < page.getTotalPage()) {
pageNum++; pageNum++;
pageInfo.setPageNum(pageNum); pageInfo.setPageNum(pageNum);
page = staffApiService.pageStaff(departmentIds, activeFlag, null, pageInfo); page = staffApiService.pageStaff(departmentIds, null, null, pageInfo);
List<StaffDTO> sonList = page.getResult(); List<StaffDTO> sonList = page.getResult();
if (CollectionUtils.isNotEmpty(sonList)) { if (CollectionUtils.isNotEmpty(sonList)) {
list.addAll(sonList); list.addAll(sonList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment