Merge remote-tracking branch 'origin/dev0.2' into dev0.2

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -565,7 +565,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		sorceObject.setGroupId(groupDTO.getId());
 		sorceObject.setGroupState(groupDTO.getState());
 		SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
-		sorceObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate()));
+		if(null!=groupDTO.getLatestTopicPublishDate()){
+			sorceObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate()));
+		}
 		sorceObject.setGroupStatisticalInfo(statisticalObjct);
 		return sorceObject;
 	}