From eee026dbf7b21d62c441af12db5e53ef8aea9adb Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 6 Jan 2017 09:47:32 +0800
Subject: [PATCH] 1

---
 .../src/main/java/com/lyms/platform/common/utils/DateUtil.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
-- 
1.8.3.1