Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

 Conflicts:

	src/com/engine/organization/service/impl/DepartmentServiceImpl.java

src/com/engine/organization/service/impl/CompServiceImpl.java

@@ -88,6 +88,7 @@ public class CompServiceImpl extends Service implements CompService {
         Map<String, Object> datas = new HashMap<>();
         PageUtil.start(params.getCurrent(), params.getPageSize());
         List<CompPO> parentList = getCompMapper().listParent();
+        PageInfo<CompPO> pageInfo = new PageInfo<>(parentList);
         List<CompPO> list = new ArrayList<>();
         list.addAll(parentList);
 
@@ -102,7 +103,7 @@ public class CompServiceImpl extends Service implements CompService {
 
         List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(list, filterList);
         PageInfo<CompListDTO> pageInfos = new PageInfo<>(compListDTOS, CompListDTO.class);
-        pageInfos.setTotal(pageInfos.getTotal());
+        pageInfos.setTotal(pageInfo.getTotal());
         pageInfos.setPageNum(params.getCurrent());
         pageInfos.setPageSize(params.getPageSize());
 

src/com/engine/organization/service/impl/DepartmentServiceImpl.java

@@ -19,8 +19,7 @@ import com.engine.organization.util.page.PageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import weaver.general.StringUtil;
 
-import java.util.*;
+import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @Author weaver_cl
@@ -29,9 +28,7 @@ import java.util.stream.Collectors;
  * @Version V1.0
  **/
 public class DepartmentServiceImpl extends Service implements DepartmentService {
-    private DepartmentMapper getDepartmentMapper() {
+
-        return MapperProxyFactory.getProxy(DepartmentMapper.class);
-    }
 
     @Override
     public PageInfo<SingleDeptTreeVO> getDeptListByPid(QuerySingleDeptListParam param) {
@@ -39,9 +36,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         //1.查询分部下所有部门
         PageUtil.start(param.getCurrent(), param.getPageSize());
         List<DepartmentPO> departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptListByCompId(param.getParentComp());
+        PageInfo<DepartmentPO> pageInfo = new PageInfo<>(departmentPOS);
         List<SingleDeptTreeVO> singleDeptTreeVOS = DepartmentBO.buildSingleDeptTreeVOS(departmentPOS);
-        PageInfo<SingleDeptTreeVO> pageInfos = new PageInfo<>(singleDeptTreeVOS, SingleDeptTreeVO.class);
+        PageInfo<SingleDeptTreeVO> pageInfos = new PageInfo<>(singleDeptTreeVOS,SingleDeptTreeVO.class);
-        pageInfos.setTotal(departmentPOS.size());
+        pageInfos.setTotal(pageInfo.getTotal());
         pageInfos.setPageNum(param.getCurrent());
         pageInfos.setPageSize(param.getPageSize());