合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/ConfigServiceImpl.java

@@ -75,7 +75,7 @@ public class ConfigServiceImpl implements ConfigService {
 
     @Override
     public List<Day> findHolidaysByMonth(String date) {
-
+        List<Day> dayList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
         SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -102,13 +102,14 @@ public class ConfigServiceImpl implements ConfigService {
                     calendar.add(Calendar.DATE,1);
                 }
                 List<Day> days2 = dayDao.saveAll(days1);
-                days = days2;
+                dayList = days2;
             }else{
                 Day startDay = dayDao.findByDateEquals(startTime);
                 System.out.println(startDay);
                 Day endDay = dayDao.findByDateEquals(endTime);
-                days.add(startDay);
-                days.add(endDay);
+                dayList.add(startDay);
+                dayList.addAll(days);
+                dayList.add(endDay);
             }
 //            Date date1 = sdf.parse(date);
 //            int year = date1.getYear()+1900;
@@ -148,7 +149,7 @@ public class ConfigServiceImpl implements ConfigService {
 //            calendar.set(Calendar.DAY_OF_MONTH,1);
 //            lastDate = calendar.getTime();
 //            return dayDao.findAllByDateBetween(firstDate,lastDate);
-            return days;
+            return dayList;
         } catch (ParseException e) {
 
         }