Commit b11766ae by qwmqiuwenmin

fix

parent 32e364d3
...@@ -218,12 +218,13 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -218,12 +218,13 @@ public class StaffApiServiceImpl implements StaffApiService {
return new Page<StaffDTO>(); return new Page<StaffDTO>();
} }
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class); // Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
List<StaffDTO> staffList = page.getResult(); // List<StaffDTO> staffList = page.getResult();
for (StaffDTO staffDTO : staffList) { // for (StaffDTO staffDTO : staffList) {
staffDTO.setDepartmentIds(map.get(staffDTO.getStaffId()) == null?null:map.get(staffDTO.getStaffId()).getDepartmentId()); // staffDTO.setDepartmentIds(map.get(staffDTO.getStaffId()) == null?null:map.get(staffDTO.getStaffId()).getDepartmentId());
} // }
return page; // return page;
return PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
} }
@Override @Override
......
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