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 | 7 ++++---
1 files changed, 4 insertions(+), 3 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 0a257b0..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,10 +72,11 @@
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()
--
Gitblit v1.8.0