From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 4bf4a0c..222aba3 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -55,7 +55,9 @@
userToCoupon.setExpireCount(validCount);
userToCoupon.setValidCount(0);
}
- userToCouponService.updateBatchById(collect2);
+ if(collect2.size() > 0){
+ userToCouponService.updateBatchById(collect2);
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -68,7 +70,7 @@
@Scheduled(cron = "0 0 0 * * *")
public void taskDay(){
try {
- locationService.updateFence();//更新线上电子围栏
+// locationService.updateFence();//更新线上电子围栏
}catch (Exception e){
e.printStackTrace();
}
@@ -107,7 +109,9 @@
tAppUser.setIsException(2);
}
}
- appUserService.updateBatchById(appUserList);
+ if(appUserList.size() > 0){
+ appUserService.updateBatchById(appUserList);
+ }
}catch (Exception e){
e.printStackTrace();
}
@@ -154,7 +158,9 @@
}
}
}
- driverService.updateBatchById(driverList);
+ if(driverList.size() > 0){
+ driverService.updateBatchById(driverList);
+ }
}catch (Exception e){
e.printStackTrace();
}
@@ -178,7 +184,9 @@
driver.setIsException(1);
}
}
- driverService.updateBatchById(driverList);
+ if(driverList.size() > 0){
+ driverService.updateBatchById(driverList);
+ }
}catch (Exception e){
e.printStackTrace();
}
--
Gitblit v1.7.1