|
@@ -548,7 +548,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
statisticRespVO.setDeptId(staff.getDeptId());
|
|
|
statisticRespVO.setDeptName(staff.getDeptName());
|
|
|
|
|
|
- Integer leaveDays = allLeaveDayOrWeekMap.get(staff.getId());
|
|
|
+ Integer leaveDays = allLeaveDayOrWeekMap.get(staff.getId()) == null ? 0 : allLeaveDayOrWeekMap.get(staff.getId());
|
|
|
statisticRespVO.setShouldFilledCount(shouldFillCount - leaveDays);
|
|
|
List<ReportDO> staffReportList = staffReportMap.get(staff.getId());
|
|
|
statisticRespVO.setFilledCount(staffReportList == null ? 0 : staffReportList.size());
|