diff --git a/src/main/java/com/lz/modules/app/controller/ReportResultController.java b/src/main/java/com/lz/modules/app/controller/ReportResultController.java
index 3fefd7bf..00b5eb2c 100644
--- a/src/main/java/com/lz/modules/app/controller/ReportResultController.java
+++ b/src/main/java/com/lz/modules/app/controller/ReportResultController.java
@@ -60,9 +60,9 @@ public class ReportResultController extends AbstractController{
         }
         ReportChartResp data = new ReportChartResp();
         //月初目标
-        List<GraphicsStatisticalDto> start = chartService.resultProgressDistribution(ResultRecordTypeEnum.TARGET.getType(),monthTime,"");
+        List<GraphicsStatisticalDto> start = chartService.resultProgressDistribution(ResultRecordTypeEnum.TARGET.getType(),monthTime,departmentId);
         //月末结果
-        List<GraphicsStatisticalDto> end = chartService.resultProgressDistribution(ResultRecordTypeEnum.RESULT.getType(),monthTime,"");
+        List<GraphicsStatisticalDto> end = chartService.resultProgressDistribution(ResultRecordTypeEnum.RESULT.getType(),monthTime,departmentId);
         //人员等级分布
         List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(departmentId);
         int total = staffService.countStaffByAllDeparmentIds(allDeparmentIds);
diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java
index 5440d60b..45946fb8 100644
--- a/src/main/java/com/lz/modules/app/service/StaffService.java
+++ b/src/main/java/com/lz/modules/app/service/StaffService.java
@@ -78,18 +78,11 @@ public interface StaffService extends IService<StaffEntity> {
     List<StaffEntity> selectBySearchName(IPage page, FindByNameModel nameModel);
     SysUserEntity getUser(String userName);
 
-<<<<<<< HEAD
     //查询部门下的所有子部门
     List<String> selectAllDeparmentIdsByDepartmentParentId(String departmentId);
     //统计部门下的人数
     int countStaffByAllDeparmentIds(List<String> deparmentIds);
 
-
-=======
-    //查询部门下的所有人员 包括子部门下人员
-    List<Long> selectAllStaffByDepartmentId(String departmentId);
-
     List<StaffEntity> selectAll();
->>>>>>> c4ca52bcf377d075780bf2f2383be4599aa3757c
 }
 
diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
index cea86c2b..1aa9fdb7 100644
--- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
+++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
@@ -56,11 +56,5 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     List<GraphicsStatisticalDto> staffDistribution(@Param("monthTime") String monthTime);
 
-<<<<<<< HEAD
-=======
-    List<ChartDto> departmentDistribution(@Param("monthTime") String monthTime);
-
-
     ResultRecord selectResultRecordByStaffIdStatus(@Param("staffId") Long staffId, @Param("status") int status);
->>>>>>> c4ca52bcf377d075780bf2f2383be4599aa3757c
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
index 1c850180..d0bdb858 100644
--- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
+++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
@@ -80,19 +80,10 @@ public interface ResultRecordService extends IService<ResultRecord> {
 	 */
 	List<GraphicsStatisticalDto> staffDistribution(String monthTime);
 
-<<<<<<< HEAD
-=======
-	/**
-	 * 部门等级占比
-	 * @param monthTime
-	 * @return
-	 */
-	List<ChartDto> departmentDistribution(String monthTime);
 
 	Map<String, List<DepartmentsEntity>> getStringListMap(List<DepartmentsEntity> tDepartments);
 
     ResultRecord selectResultRecordByStaffIdStatus(Long staffId, int status);
 
 	R reject( ResultRecord resultRecord,ResultRecordReq req, Long userId);
->>>>>>> c4ca52bcf377d075780bf2f2383be4599aa3757c
 }
\ No newline at end of file