From 7a8d909df3ae24a6db4d45b0ac90ae966e2322a4 Mon Sep 17 00:00:00 2001
From: zhonghua <zhonghua>
Date: Thu, 9 Apr 2026 11:41:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E9=98=B6=E6=AE=B5=E7=AD=9B=E9=80=89=E6=9C=AA=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E4=B8=8E=E5=B7=B2=E7=BB=93=E6=9D=9F=EF=BC=9B=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E4=BB=85=E4=BF=9D=E7=95=99=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Made-with: Cursor
---
 .../biz/contest/service/impl/ContestServiceImpl.java  | 11 ++++++++++-
 frontend/src/views/contests/Index.vue                 |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java b/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java
index ac8b169..7f85245 100644
--- a/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java
+++ b/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java
@@ -128,19 +128,28 @@ public class ContestServiceImpl extends ServiceImpl<ContestMapper, BizContest> i
             wrapper.eq(BizContest::getContestType, dto.getContestType());
         }
 
-        // 阶段筛选
+        // 阶段筛选（与前端活动列表「活动阶段」一致：unpublished/finished/registering/submitting/reviewing）
         if (StringUtils.hasText(dto.getStage())) {
             LocalDateTime now = LocalDateTime.now();
             switch (dto.getStage()) {
+                case "unpublished":
+                    wrapper.eq(BizContest::getContestState, PublishStatus.UNPUBLISHED.getValue());
+                    break;
+                case "finished":
+                    wrapper.eq(BizContest::getStatus, "finished");
+                    break;
                 case "registering":
+                    wrapper.eq(BizContest::getContestState, PublishStatus.PUBLISHED.getValue());
                     wrapper.le(BizContest::getRegisterStartTime, now)
                            .ge(BizContest::getRegisterEndTime, now);
                     break;
                 case "submitting":
+                    wrapper.eq(BizContest::getContestState, PublishStatus.PUBLISHED.getValue());
                     wrapper.le(BizContest::getSubmitStartTime, now)
                            .ge(BizContest::getSubmitEndTime, now);
                     break;
                 case "reviewing":
+                    wrapper.eq(BizContest::getContestState, PublishStatus.PUBLISHED.getValue());
                     wrapper.le(BizContest::getReviewStartTime, now)
                            .ge(BizContest::getReviewEndTime, now);
                     break;
diff --git a/frontend/src/views/contests/Index.vue b/frontend/src/views/contests/Index.vue
index 665996d..159755a 100644
--- a/frontend/src/views/contests/Index.vue
+++ b/frontend/src/views/contests/Index.vue
@@ -151,12 +151,16 @@
                 <a-button v-permission="'contest:update'" type="link" size="small" @click="handleEdit(record.id)">编辑</a-button>
                 <a-button v-permission="'contest:delete'" type="link" danger size="small" @click="handleDeleteClick(record)">删除</a-button>
               </template>
-              <!-- 已发布：查看、添加评委、取消发布 -->
-              <template v-else>
+              <!-- 已发布且未结束：查看、评委、取消发布 -->
+              <template v-else-if="record.status !== 'finished'">
                 <a-button type="link" size="small" @click="router.push(`/${tenantCode}/contests/${record.id}`)">查看</a-button>
                 <a-button v-permission="'contest:update'" type="link" size="small" @click="handleAddJudge(record.id)">评委</a-button>
                 <a-button v-permission="'contest:publish'" type="link" size="small" style="color: #f59e0b" @click="handlePublishClick(record)">取消发布</a-button>
               </template>
+              <!-- 已结束：仅查看 -->
+              <template v-else>
+                <a-button type="link" size="small" @click="router.push(`/${tenantCode}/contests/${record.id}`)">查看</a-button>
+              </template>
             </template>
             <!-- 超管端操作 -->
             <a-button v-if="isSuperAdmin" type="link" size="small"