From e4c065d96a605cd8f60103b31dfbe4d1fe34aae8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 11 七月 2025 08:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs

---
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index fc4e244..c14da80 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -32,7 +32,7 @@
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
         List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
-        if (wrkMasts.isEmpty()) {
+        if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {
@@ -51,7 +51,7 @@
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute3(){
         List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData2();
-        if (wrkMasts.isEmpty()) {
+        if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {

--
Gitblit v1.9.1