Merge branch 'developer' into 'master'

Developer

See merge request !99

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

@@ -466,6 +466,17 @@ public class StaffController extends WebBaseController{
 		List<String> departmentIds = relationList.stream().map(DepartmentShortDTO::getDepartmentId).collect(Collectors.toList());
 		Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
 		List<StaffDTO> list = page.getResult();
+		logger.info("pages={},totalPage={}",page.getCurrentPage(),page.getTotalPage());
+		while(page.getCurrentPage() < page.getTotalPage()){
+			pageNum ++ ;
+			pageInfo.setPageNum(pageNum);
+			page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
+			List<StaffDTO> sonList = page.getResult();
+			if(CollectionUtils.isNotEmpty(sonList)){
+				list.addAll(sonList);
+			}
+			logger.info("sonList={}",sonList.size());
+		}
 		List<StaffExportVO> voList = new ArrayList<>();
 		for (StaffDTO staffDTO : list) {
 			StaffExportVO vo = new StaffExportVO();
@@ -481,15 +492,6 @@ public class StaffController extends WebBaseController{
 			vo.setActiveFlag(active);
 			voList.add(vo);
 		}
-		while(page.getPages() < page.getTotalPage()){
-			pageNum ++ ;
-			pageInfo.setPageNum(pageNum);
-			page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
-			List<StaffDTO> sonList = page.getResult();
-			if(CollectionUtils.isNotEmpty(sonList)){
-				list.addAll(sonList);
-			}
-		}
 		//拼接导购信息
 		mergeClerkInfo(voList, wxEnterpriseId);
 		String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);