Commit b84eb377 by qwmqiuwenmin

fix

parent 49709a65
...@@ -112,26 +112,13 @@ public class StaffController extends WebBaseController{ ...@@ -112,26 +112,13 @@ public class StaffController extends WebBaseController{
List<String> departmentIds = sonDepartmentList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList()); List<String> departmentIds = sonDepartmentList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,activeFlag,keyWord,pageInfo); Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,activeFlag,keyWord,pageInfo);
List<StaffDTO> list = page.getResult(); List<StaffDTO> list = page.getResult();
// if(list != null) {
// for (StaffDTO staffDTO : list) {
// logger.info("【成员列表】departmentId={},staffId={}",departmentId,staffDTO.getStaffId());
// StaffDepartmentRelatedDTO related = staffApiService.getDepartmentIdAndStaffId(departmentId,staffDTO.getStaffId());
// logger.info("【成员列表】related={}",JSON.toJSONString(related));
// if(related != null) {
// staffDTO.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
// staffDTO.setClerkCode(related.getClerkCode());
// }
// }
// }
logger.info("【员工列表】page={}",JSON.toJSONString(page));
PageResult<StaffDTO> pageVo = new PageResult<>(); PageResult<StaffDTO> pageVo = new PageResult<>();
pageVo.setList(list); pageVo.setList(list);
pageVo.setPageNum(page.getCurrentPage()); pageVo.setPageNum(page.getCurrentPage());
pageVo.setPages(page.getPages()); pageVo.setPages(page.getPages());
pageVo.setPageSize(page.getPageSize()); pageVo.setPageSize(page.getPageSize());
pageVo.setTotal(page.getTotalCount()); pageVo.setTotal(page.getTotalCount());
logger.info("【员工列表】page={}",1);
return resultResponse(HaoBanErrCode.ERR_1, pageVo); return resultResponse(HaoBanErrCode.ERR_1, pageVo);
} }
......
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