From bd75d2cfafa840933d254868a572bee826306795 Mon Sep 17 00:00:00 2001
From: ieaii <1069385070@qq.com>
Date: Wed, 4 Dec 2024 23:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BA=BF=E4=B8=8A=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=AF=BC=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-hanhai-vue/src/api/manage.js                                 | 3 ++-
 .../jeecg/modules/clockinlog/controller/ClockinLogController.java  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin-hanhai-vue/src/api/manage.js b/admin-hanhai-vue/src/api/manage.js
index 4abe6dc..ec860f6 100644
--- a/admin-hanhai-vue/src/api/manage.js
+++ b/admin-hanhai-vue/src/api/manage.js
@@ -125,7 +125,8 @@ export function downFile(url,parameter){
     url: url,
     params: parameter,
     method:'get' ,
-    responseType: 'blob'
+    responseType: 'blob',
+    timeout: 6000000,
   })
 }
 
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java
index bb97090..ef5508a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.java
@@ -205,9 +205,10 @@ public class ClockinLogController extends JeecgController<ClockinLog, IClockinLo
 
 
 //		 int day = Integer.parseInt(DateUtils2.getNowMonthMaxDay());
-		 String nowYearMonth = clockStartTimes[0];
-		 if(StringUtils.isBlank(clockStartTimes[0])){
-			 nowYearMonth = DateUtils2.getNowYearMonth();
+		 String nowYearMonth = DateUtils2.getNowYearMonth();
+
+		 if(clockStartTimes!=null && clockStartTimes.length!=0 && StringUtils.isNotBlank(clockStartTimes[0])){
+			 nowYearMonth = clockStartTimes[0];
 		 }
 		 YearMonth yearMonth = YearMonth.parse(nowYearMonth);
 		 int day = yearMonth.lengthOfMonth();