diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 78d72c6c..22b1b10d 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -88,6 +88,7 @@ public class CompServiceImpl extends Service implements CompService { Map datas = new HashMap<>(); PageUtil.start(params.getCurrent(), params.getPageSize()); List parentList = getCompMapper().listParent(); + PageInfo pageInfo = new PageInfo<>(parentList); List list = new ArrayList<>(); list.addAll(parentList); @@ -100,7 +101,7 @@ public class CompServiceImpl extends Service implements CompService { List compListDTOS = CompBO.buildCompDTOList(list, filterList); PageInfo pageInfos = new PageInfo<>(compListDTOS, CompListDTO.class); - pageInfos.setTotal(pageInfos.getTotal()); + pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(params.getCurrent()); pageInfos.setPageSize(params.getPageSize()); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 3fdfca59..44c9a89d 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -28,9 +28,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService //1.查询分部下所有部门 PageUtil.start(param.getCurrent(),param.getPageSize()); List departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptListByCompId(param.getParentComp()); + PageInfo pageInfo = new PageInfo<>(departmentPOS); List singleDeptTreeVOS = DepartmentBO.buildSingleDeptTreeVOS(departmentPOS); PageInfo pageInfos = new PageInfo<>(singleDeptTreeVOS,SingleDeptTreeVO.class); - pageInfos.setTotal(departmentPOS.size()); + pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(param.getCurrent()); pageInfos.setPageSize(param.getPageSize());