Explorar o código

兼容报警时间为空的数据

吴洪双 %!s(int64=5) %!d(string=hai) anos
pai
achega
5503ead35a
Modificáronse 1 ficheiros con 4 adicións e 2 borrados
  1. 4 2
      src/main/java/com/shawn/model/dto/TEquipmentDTO.java

+ 4 - 2
src/main/java/com/shawn/model/dto/TEquipmentDTO.java

@@ -62,7 +62,9 @@ public class TEquipmentDTO extends TEquipment {
     }
 
     public void setOccurrenceTime(Date occurrenceTime) {
-        this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);
-        this.occurrenceTime = occurrenceTime;
+        if(null != occurrenceTime){
+            this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);
+            this.occurrenceTime = occurrenceTime;
+        }
     }
 }