From ca68b6566b2208dd5a427cc9824fb2355393ecf2 Mon Sep 17 00:00:00 2001
From: xiangZr-hhh <“2774915446@qq.com”>
Date: Mon, 22 Apr 2024 22:27:08 +0800
Subject: [PATCH] =?UTF-8?q?patch:=E6=97=A5=E5=BF=97=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

日期判空
---
 .../java/com/jsl/oa/controllers/ProjectDailyController.java   | 4 ----
 .../java/com/jsl/oa/services/impl/ProjectServiceImpl.java     | 1 -
 src/main/java/com/jsl/oa/utils/Processing.java                | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java
index 426ec89..4e398ab 100644
--- a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java
+++ b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java
@@ -106,10 +106,6 @@ public class ProjectDailyController {
             return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL);
         }
 
-        if (projectId == null) {
-            return ResultUtil.error(ErrorCode.ID_NOT_EXIST);
-        }
-
         return projectDailyService.searchMyDaily(projectId,
                 page,
                 pageSize,
diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
index f446a0e..47d9d60 100644
--- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
@@ -641,7 +641,6 @@ public class ProjectServiceImpl implements ProjectService {
             projectDailyDAO.deleteDailyByProject(id1);
         }
 
-
         return ResultUtil.success();
     }
 }
diff --git a/src/main/java/com/jsl/oa/utils/Processing.java b/src/main/java/com/jsl/oa/utils/Processing.java
index 3ad1f55..4593799 100755
--- a/src/main/java/com/jsl/oa/utils/Processing.java
+++ b/src/main/java/com/jsl/oa/utils/Processing.java
@@ -416,7 +416,7 @@ public class Processing {
      * @Param dateString:
      **/
     public static Date convertStringToDate(String dateString) {
-        if (dateString.isEmpty()) {
+        if (dateString == null || dateString.isEmpty()) {
             return null; // 如果字符串为空，返回空的Date对象
         } else {
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");