|
@@ -381,7 +381,7 @@ public class SubscriptionServiceImpl implements SubscriptionService {
|
|
|
SubscriptionsExample example = new SubscriptionsExample();
|
|
|
example.createCriteria().andMemberIdEqualTo(members.getId())
|
|
|
.andStatusEqualTo(SubscriptionStatusEnum.ACTIVED.value()).andTargetTypeEqualTo(sub.getTargetType())
|
|
|
- .andIdNotEqualTo(sub.getId());
|
|
|
+ .andIdNotEqualTo(sub.getId()).andEndDateGreaterThanOrEqualTo(new Date());
|
|
|
example.setOrderByClause("end_date DESC");
|
|
|
return subscriptionsMapper.selectByExample(example);
|
|
|
}
|