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");