diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java
index a4ec665b..54ce7356 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java
@@ -265,7 +265,7 @@ public class ChartServiceImpl implements ChartService {
 
     @Override
     public PageUtils reportDistribution(ResultDistributionReq req) {
-        List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId());
+        /*List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId());
         // 去除存在子部门得id
         allDeparmentIds.removeIf(s -> {
             List<DepartmentsEntity> departmentsEntities = departmentsDao.selectEntityByParentDepartmentId(s);
@@ -277,7 +277,24 @@ public class ChartServiceImpl implements ChartService {
 
         // 由于deparmentIds 递归所得无法分页  则list分页
         List<String> list = ListUtils.startPage(allDeparmentIds, req.getCurrPage(), req.getPageSize());
-        return buildPages(list,req,allDeparmentIds.size());
+        return buildPages(list,req,allDeparmentIds.size());*/
+        //获取一级目录
+        List<DepartmentsDto> departmentsParentsList = departmentsDao.getDepartmentsByparentId("1");
+        if(CollectionUtils.isEmpty(departmentsParentsList)){
+            return new PageUtils();
+        }
+        List<DepartmentsDto> oneDepartmentsParentsList = Lists.newArrayList();
+        departmentsParentsList.forEach(departmentsDto -> {
+            List<DepartmentsDto> departmentsParentsList1 = departmentsDao.getDepartmentsByparentId(departmentsDto.getDepartmentId());
+            oneDepartmentsParentsList.addAll(departmentsParentsList1);
+        });
+
+        List<DepartmentsDto> list = ListUtils.startPage(oneDepartmentsParentsList, req.getCurrPage(), req.getPageSize());
+        if(CollectionUtils.isEmpty(list)){
+            return new PageUtils();
+        }
+        List<String> collect = list.stream().map(DepartmentsDto::getDepartmentId).collect(Collectors.toList());
+        return buildPages(collect,req,oneDepartmentsParentsList.size());
     }
 
 
@@ -324,8 +341,8 @@ public class ChartServiceImpl implements ChartService {
         }
         departments.forEach(s -> {
             DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(s);
-            List<DepartmentsEntity> departmentsEntities = departmentsDao.selectEntityByParentDepartmentId(departmentsEntity.getDepartmentParentId());
-            List<String> staffIds = staffService.staffsByAllDeparmentIds(Lists.newArrayList(s));
+            List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(s);
+            List<String> staffIds = staffService.staffsByAllDeparmentIds(allDeparmentIds);
             List<GraphicsStatisticalDto> staffLevels = resultRecordService.staffDistribution(req.getSelectMonthTime(),staffIds);
             Map<String,Integer> map = Maps.newHashMap();
             for (GraphicsStatisticalDto staffLevel : staffLevels) {