diff --git a/eeos/src/main/java/com/blackcompany/eeos/target/application/service/AttendService.java b/eeos/src/main/java/com/blackcompany/eeos/target/application/service/AttendService.java index 3e92aea9..2049a246 100644 --- a/eeos/src/main/java/com/blackcompany/eeos/target/application/service/AttendService.java +++ b/eeos/src/main/java/com/blackcompany/eeos/target/application/service/AttendService.java @@ -249,6 +249,9 @@ public PageResponse findMyAttendInfo( public AttendSummaryInfoResponse getMyAttendSummary(Long startDate, Long endDate) { Long memberId = RequestScope.getMemberId(); + if (startDate == null) startDate = calendarProvider.getCalendar().getStartDate().getTime(); + if (endDate == null) endDate = calendarProvider.getCalendar().getEndDate().getTime(); + List programs = programDateRangeService.getPrograms(startDate, endDate); List attends = findMyAttends(programs); @@ -329,6 +332,7 @@ public AttendPenaltyRankingResponse getMyPenaltyRanking(int rankOffset) { Long myPenaltyPoint = penaltyPointRepository.findTotalPenaltyScoreByMemberId(startDate, endDate, memberId); + if (myPenaltyPoint == null) myPenaltyPoint = 0L; long myPenaltyRank = penaltyPointRepository.countByPenaltyPointGreaterThan(startDate, endDate, myPenaltyPoint) + 1;