Commit e03b5355 by s_guodong

update

parent 2f38d516
......@@ -41,9 +41,10 @@ public class MyDateDeSerialized extends JsonDeserializer {
try {
date = simpleDateFormat.parse(source);
} catch (ParseException e) {
ValidatorUtil.CHECK_ERR_MSG.set(annotation.message());
ValidatorUtil.CHECK_ERR_MSG.set(annotation == null ? "时间格式不正确" : annotation.message());
return null;
}
if (annotation != null) {
String regexp = annotation.regexp();
boolean match = source.matches(regexp);
if (!match) {
......@@ -51,6 +52,7 @@ public class MyDateDeSerialized extends JsonDeserializer {
return null;
}
}
}
return date;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment