|
|
@@ -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;
|