From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Wed, 12 Jun 2019 14:33:25 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- src/main/java/com/moral/common/convert/StringToDateConverter.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/moral/common/convert/StringToDateConverter.java b/src/main/java/com/moral/common/convert/StringToDateConverter.java index 0b16948..e999880 100644 --- a/src/main/java/com/moral/common/convert/StringToDateConverter.java +++ b/src/main/java/com/moral/common/convert/StringToDateConverter.java @@ -25,7 +25,7 @@ public Date convert(String source) { try { if(StringUtils.isNullOrEmpty(source)){ - throw new BusinessException(String.format("parser %s to Date fail", source)); + return null; } if(StringUtils.isNumericZidai(source)) { source = source.length() == 10 ? source+"000" : source; @@ -40,7 +40,6 @@ e.printStackTrace(); log.error(e.getMessage()); } - return null; } -- Gitblit v1.8.0