zoujiajian 3 년 전
부모
커밋
68bfc3a1f7
1개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

+ 3 - 1
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -91,7 +91,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
 			ticket.setRelationViews(relationUserViews);
-			ticket.setExpiryTime(DateUtil.parse(ticket.getExpiryTime().toString(), "yyyy-MM-dd"));
+			if (ticket.getExpiryTime() != null) {
+				ticket.setExpiryTime(DateUtil.parse(ticket.getExpiryTime().toString(), "yyyy-MM-dd"));
+			}
 			return true;
 		}).collect(Collectors.toList());
 		return collect;