From 3714621173c606c4c58439ed8941100ce9ddea14 Mon Sep 17 00:00:00 2001
From: Codex Assistant <codex@example.com>
Date: 星期三, 05 十一月 2025 15:10:49 +0800
Subject: [PATCH] bug
---
backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java b/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java
index 845d515..fb8b6e4 100644
--- a/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java
+++ b/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java
@@ -72,25 +72,26 @@
page = activityRepository.findByPidAndStateOrderByCreateTimeDesc(0L, state, pageable);
}
} else if (hasName) {
- page = activityRepository.findByPidAndNameContainingOrderByCreateTimeDesc(0L, name, pageable);
+ // 褰搒tate涓簄ull浣嗘湁鍚嶇О鎼滅储鏃讹紝闇�瑕佽繃婊ゆ帀宸插垹闄ょ殑姣旇禌锛坰tate != 0锛�
+ page = activityRepository.findByPidAndStateNotAndNameContainingOrderByCreateTimeDesc(0L, 0, name, pageable);
} else {
- // 鏌ヨ鎵�鏈変富娲诲姩锛坧id = 0锛�
- page = activityRepository.findByPidOrderByCreateTimeDesc(0L, pageable);
+ // 褰搒tate涓簄ull鏃讹紝鏌ヨ鎵�鏈夋湭鍒犻櫎鐨勪富娲诲姩锛坧id = 0 涓� state != 0锛�
+ page = activityRepository.findByPidAndStateNotOrderByCreateTimeDesc(0L, 0, pageable);
}
List<ActivityResponse> content = page.getContent().stream()
.map(activity -> {
ActivityResponse response = new ActivityResponse(activity);
- // 璁剧疆鍙傝禌浜烘暟锛堝彧缁熻绗竴闃舵鐨勫鏍搁�氳繃瀛﹀憳浜烘暟锛�
+ // 璁剧疆鍙傝禌浜烘暟锛堢粺璁＄涓�闃舵鐨勫緟瀹℃牳鍜屽鏍搁�氳繃瀛﹀憳浜烘暟锛�
int playerCount = 0;
Activity firstStage = activityRepository.findFirstStageByActivityId(activity.getId());
if (firstStage != null) {
- // 濡傛灉鏈夌涓�闃舵锛岀粺璁＄涓�闃舵鐨勫鏍搁�氳繃浜烘暟
- Long playerCountLong = activityPlayerRepository.countByStageIdAndState(firstStage.getId(), 1);
+ // 濡傛灉鏈夌涓�闃舵锛岀粺璁＄涓�闃舵鐨勫緟瀹℃牳鍜屽鏍搁�氳繃浜烘暟
+ Long playerCountLong = activityPlayerRepository.countByStageId(firstStage.getId());
playerCount = playerCountLong != null ? playerCountLong.intValue() : 0;
} else {
- // 濡傛灉娌℃湁闃舵锛岀粺璁℃椿鍔ㄦ湰韬殑瀹℃牳閫氳繃浜烘暟
- Long playerCountLong = activityPlayerRepository.countByActivityIdAndState(activity.getId(), 1);
+ // 濡傛灉娌℃湁闃舵锛岀粺璁℃椿鍔ㄦ湰韬殑寰呭鏍稿拰瀹℃牳閫氳繃浜烘暟
+ Long playerCountLong = activityPlayerRepository.countByActivityId(activity.getId());
playerCount = playerCountLong != null ? playerCountLong.intValue() : 0;
}
response.setPlayerCount(playerCount);
--
Gitblit v1.8.0