fix

src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java

@@ -116,9 +116,15 @@ public class AssessManagerServiceImpl implements AssessManagerService {
                 res.setCycleTime(name.substring(0,name.lastIndexOf("绩效考核")));
             }
             //过滤非自己管理的人员
-            int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId(),mandepartmentIds);
             ResultRecord resultRecord = resultRecordMapper.selectOneByStartId(flowStart.getId());
-            res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + i + "等人");
+            //没有管理的部门
+            if(mandepartmentIds!=null && mandepartmentIds.size()==0){
+                res.setJoinNum("0人");
+            }else {
+                int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId(),mandepartmentIds);
+                res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + i + "等人");
+            }
+
             data.add(res);
         });
         PageUtils pages = new PageUtils();
@@ -136,6 +142,12 @@ public class AssessManagerServiceImpl implements AssessManagerService {
         if(StringUtil.isNotBlank(req.getEvaluationIds())){
             req.setCopyEvaluationIds(evaluationGroupService.getEvaluationCopyIdsByEvaluationIds(req.getEvaluationIds(),req.getStartId()));
         }
+        List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
+        //没有管理的部门
+        if(mandepartmentIds!=null && mandepartmentIds.size()==0){
+            return new PageUtils();
+        }
+        req.setDepartmentIds(mandepartmentIds);
         PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
                 page ->  resultRecordMapper.selectAssessListByStartId(page,req)
         );

src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java

@@ -93,6 +93,9 @@ public class ChartResultServiceImpl implements ChartResultService {
         }
         //自己管理的部门
         List<String> mandepartmentIds = assessService.roleDepartments(staffId);
+        if(mandepartmentIds!=null && mandepartmentIds.size()==0){
+            return Lists.newArrayList();
+        }
         List<ChartStatisticalRes> data = Lists.newArrayList();
         ChartStatisticalRes res;
 
@@ -187,12 +190,19 @@ public class ChartResultServiceImpl implements ChartResultService {
         //自己管理的和所有的部门交集
         log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(allDeparmentIds));
         List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
-        log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds));
+        if(mandepartmentIds!=null ){
-        mandepartmentIds.retainAll(allDeparmentIds);
+            if(mandepartmentIds.size()==0){
+                return new PageUtils();
+            }
+            log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds));
+            mandepartmentIds.retainAll(allDeparmentIds);
+            if(mandepartmentIds.size()==0){
+                return new PageUtils();
+            }
+        }
         log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds));
-        List<String> ids = staffService.staffsByAllDeparmentIds(mandepartmentIds);
         PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
-                page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getScoreLevel())
+                page -> resultRecordMapper.selectChartDetailList(page,mandepartmentIds,req.getStartId(),req.getScoreLevel())
         );
         return pageUtils;
     }
@@ -228,6 +238,9 @@ public class ChartResultServiceImpl implements ChartResultService {
         req.setCopyEvaluationIds(evaluationGroupService.getEvaluationCopyIdsByEvaluationIds(req.getEvaluationIds(),req.getStartId()));
         //获取自己管理的部门
         List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
+        if(mandepartmentIds!=null && mandepartmentIds.size()==0){
+            return Lists.newArrayList();
+        }
         req.setDepartmentIds(mandepartmentIds);
         List<ChartStatistical> process = resultRecordMapper.countAssessNumByFlowProcess(req);
         List<ChartStatistical> data = buildProcess(process, req.getStartId(),mandepartmentIds,req);

src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java

@@ -79,7 +79,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId,@Param("evaluationIds")List<Long> evaluationIds,@Param("departmentIds")List<String> departmentIds);
 
-    List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel);
+    List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("departmentIds") List<String> departmentIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel);
 
     int batchDeleteByStartId(@Param("startId")Long startId);
 

src/main/resources/mapper/app/ResultRecordMapper.xml

@@ -404,10 +404,10 @@
         on r.staff_id = s.id
         where r.is_delete =0 and s.is_delete=0
         and r.start_id = #{startId}
-        <if test="staffIds!=null and  staffIds.size()!=0">
+        <if test="departmentIds!=null and  departmentIds.size()!=0">
-            and r.staff_id in (
+            and r.department_id in (
-            <foreach collection="staffIds" item="staff_id" separator=",">
+            <foreach collection="departmentIds" item="department_id" separator=",">
-                #{staff_id}
+                #{department_id}
             </foreach>
             )
         </if>