Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp

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<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);
 			});