From 658c1d5fcc47ca30c72c51f98f2df739700fe125 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 12 十一月 2024 17:26:22 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 1af5c61..c03cf47 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -86,7 +86,7 @@
                 date = date.substring(0,i);
             }
         }
-        //TimeZone tz = TimeZone.getTimeZone("GMT-01");
+        //TimeZone tz = TimeZone.getTimeZone("GMT-01");2024-10-21T10:40:04+08:00
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
 //        DateFormat df = new SimpleDateFormat("2023-12-08 T 09:25:54.698+08:00");
         df.setTimeZone(tz);
@@ -1283,6 +1283,9 @@
      * @return
      */
     public static Date getXMinuteAfterDate(Date date, int minute) {
+        if(date ==null){
+            date = new Date();
+        }
         Calendar now = Calendar.getInstance();
         now.setTime(date);
         now.set(Calendar.MINUTE, now.get(Calendar.MINUTE) + minute);

--
Gitblit v1.9.3