diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java index 783f931995592000e14b4075163b88d5555851a0..141515a6ede09e07470f7fe96f3ee99bead171d5 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java @@ -217,8 +217,12 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController< List<List<Map<String, Object>>> lists = list.stream().map(item -> { - Map<Integer, String> collect = item.getAttendanceStaffStatEntities().stream().collect(Collectors.toMap(x -> x.getYear() + x.getMonth() + x.getDay(), y -> y.getAttendanceSummary())); + List<AttendanceStaffStatEntity> attendanceStaffStatEntities = item.getAttendanceStaffStatEntities(); + Map<Integer, String> collect = new HashMap<>(); + if (!ObjectUtils.isEmpty(attendanceStaffStatEntities)) { + collect = attendanceStaffStatEntities.stream().collect(Collectors.toMap(x -> x.getYear() + x.getMonth() + x.getDay(), y -> y.getAttendanceSummary())); + } List<Map<String, Object>> mapList = new ArrayList<>(); for (int i = 1; i <= subDay.intValue(); i++) { DateTime curDate = DateUtil.offsetDay(startDate, i);