From 392f7a3134cb7a27a555bb1b3e2f3601c5eadde1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 15:06:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Date.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Date.java b/server/system_service/src/main/java/com/doumee/core/utils/Date.java
index 3e8e209..699473a 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Date.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Date.java
@@ -16,6 +16,9 @@
* @return java.util.Date
*/
public java.util.Date getStart (java.util.Date date) {
+ if(date ==null){
+ return null;
+ }
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.HOUR_OF_DAY, 0);
@@ -42,6 +45,9 @@
* @return java.util.Date
*/
public java.util.Date getEnd (java.util.Date date) {
+ if(date ==null){
+ return null;
+ }
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + 1);
--
Gitblit v1.9.3