|
@@ -2182,7 +2182,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
LocalDate now = LocalDate.now();
|
|
|
|
|
|
LocalDate startDate = LocalDate.of(year, Objects.isNull(month)?1:month, 1);
|
|
|
- while (year.equals(startDate.get(ChronoField.MONTH_OF_YEAR))){
|
|
|
+ Integer oldMonth = Objects.isNull(month)?new Integer(1):month;
|
|
|
+ while (oldMonth.equals(startDate.get(ChronoField.MONTH_OF_YEAR))){
|
|
|
String dateStr = DateUtil.dateFormatter.format(startDate);
|
|
|
if(!dates.contains(dateStr)){
|
|
|
monthIncomeMapList.add(new LocalDateBigDecimalMapDto(Date.from(startDate.atStartOfDay(DateUtil.zoneId).toInstant()), dateStr, BigDecimal.ZERO));
|