develop #46

Merged
XiaoLFeng merged 10 commits from develop into master 2024-04-25 16:54:11 +08:00
3 changed files with 1 additions and 6 deletions
Showing only changes of commit ca68b6566b - Show all commits

View File

@ -106,10 +106,6 @@ public class ProjectDailyController {
return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL); return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL);
} }
if (projectId == null) {
return ResultUtil.error(ErrorCode.ID_NOT_EXIST);
}
return projectDailyService.searchMyDaily(projectId, return projectDailyService.searchMyDaily(projectId,
page, page,
pageSize, pageSize,

View File

@ -641,7 +641,6 @@ public class ProjectServiceImpl implements ProjectService {
projectDailyDAO.deleteDailyByProject(id1); projectDailyDAO.deleteDailyByProject(id1);
} }
return ResultUtil.success(); return ResultUtil.success();
} }
} }

View File

@ -416,7 +416,7 @@ public class Processing {
* @Param dateString: * @Param dateString:
**/ **/
public static Date convertStringToDate(String dateString) { public static Date convertStringToDate(String dateString) {
if (dateString.isEmpty()) { if (dateString == null || dateString.isEmpty()) {
return null; // 如果字符串为空返回空的Date对象 return null; // 如果字符串为空返回空的Date对象
} else { } else {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");