diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index af7be24b5e..2751959bd9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1246,7 +1246,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl { AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean(); bean.setDescribe(item.getAchievementName()); - bean.setCompletionDate(DateUtils.dateToTimestamp(item.getArriveTime())); + if (item.getArriveTime() != null){ + bean.setCompletionDate(DateUtils.dateToTimestamp(item.getArriveTime())); + } bean.setIsArrive(item.getIsArrive()); achievementList.add(bean); });