|
@@ -63,6 +63,9 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
startDate = startDate.withDayOfMonth(1);
|
|
|
|
|
|
LocalDate endDate = startDate.withMonth(12);
|
|
|
+ if(nowDate.getYear()>endDate.getYear()){
|
|
|
+ currentMonth = Date.from(endDate.atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
+ }
|
|
|
|
|
|
Set<Integer> organIds = null;
|
|
|
if(StringUtils.isNotBlank(organIdsStr)){
|