xujunwei 1 vuosi sitten
vanhempi
commit
4527ff85d9

+ 3 - 0
framework-common/src/main/java/com/mrxu/framework/common/util/DateFunc.java

@@ -451,6 +451,9 @@ public class DateFunc {
     }
 
     public static String getPassTime(Date date) {
+        if(date == null) {
+            return null;
+        }
         long second = (System.currentTimeMillis() - date.getTime())/1000;
         if(second < 60) {
             return "刚刚";