From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 8df779d..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();
         }
@@ -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