| | |
|---|
| | | page = activityRepository.findByPidAndStateOrderByCreateTimeDesc(0L, state, pageable); |
|---|
| | | } |
|---|
| | | } else if (hasName) { |
|---|
| | | page = activityRepository.findByPidAndNameContainingOrderByCreateTimeDesc(0L, name, pageable); |
|---|
| | | // 当state为null但有名称搜索时，需要过滤掉已删除的比赛（state != 0） |
|---|
| | | page = activityRepository.findByPidAndStateNotAndNameContainingOrderByCreateTimeDesc(0L, 0, name, pageable); |
|---|
| | | } else { |
|---|
| | | // 查询所有主活动（pid = 0） |
|---|
| | | page = activityRepository.findByPidOrderByCreateTimeDesc(0L, pageable); |
|---|
| | | // 当state为null时，查询所有未删除的主活动（pid = 0 且 state != 0） |
|---|
| | | page = activityRepository.findByPidAndStateNotOrderByCreateTimeDesc(0L, 0, pageable); |
|---|
| | | } |
|---|
| | | |
|---|
| | | List<ActivityResponse> content = page.getContent().stream() |
|---|
