From 7010a3596cdd31766155a883b47515f46eaa0630 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sun, 25 Apr 2021 13:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=B0=B1=E6=9C=AA=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=97=B6=20=E6=97=B6=E9=97=B4=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/service/impl/ResiGroupServiceImpl.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 6799e92c4e..4b3abfb464 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
@@ -1218,7 +1218,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			achievedList.forEach(item -> {
 				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);
 			});