diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 64ac59c..3ada921 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -95,7 +95,7 @@ public class DateUtil { return (Math.abs(year1 - year2)+i); } public static Integer getAge(Date birth,Date fmDate) { - if (birth == null) { + if (birth == null ||null==fmDate) { return null; } long m = fmDate.getTime() - birth.getTime();