管理端节假日

mailbox-outer-admin/src/main/java/com/biutag/outeradmin/controller/HolidayController.java

@@ -35,20 +35,25 @@ public class HolidayController {
         HolidayYear getYear = JSON.parseObject(year, HolidayYear.class);
         HolidayRefresh holidayRefresh = new HolidayRefresh();
         LocalDateTime currentDate = LocalDateTime.now();
-
         String currentYear = Integer.toString(currentDate.getYear());
-//        String currentYear = "2025";
+        System.out.println(currentYear);
-        if (getYear.getYear().equals(currentYear)) {
+            holidayMapper.delete(null);
+            if (getYear.getYear()==null||getYear.getYear().equals("")){
+                System.out.println("1111111111111");
+                List<Holiday> holidays = HolidayUtil.getAllHolidayByYear(currentYear);
+                holidayService.saveBatch(holidays);
                 holidayRefresh.setMessage("success");
+                holidayRefresh.setHolidayList(getlist());
+                return holidayRefresh;
             }else{
-            holidayMapper.delete(null);
+                System.out.println("222222222222222");
                 List<Holiday> holidays = HolidayUtil.getAllHolidayByYear(getYear.getYear());
                 holidayService.saveBatch(holidays);
                 holidayRefresh.setMessage("success");
-        }
                 holidayRefresh.setHolidayList(getlist());
                 return holidayRefresh;
             }
+    }
 
 
     @RequestMapping("/show-holiday")