From 2b4111f28a47df2120872e1ca956a582d3df7b7a Mon Sep 17 00:00:00 2001
From: zhangrui <zr15972328402@163.com>
Date: Wed, 6 May 2026 10:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B4=BB=E5=8A=A8=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8E=A7=E5=88=B6=EF=BC=9A=E5=BD=93=E5=89=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=AF=E5=90=A6=E5=9C=A8=E6=B4=BB=E5=8A=A8=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E5=86=85=E3=80=82=E6=98=BE=E7=A4=BA=E6=9C=AA=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E7=9A=84=E6=89=80=E6=9C=89=E6=B4=BB=E5=8A=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E6=B2=A1=E5=BC=80=E5=A7=8B=E7=9A=84=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/budwk/app/sys/controller/SysHomeController.java     | 6 +++---
 .../zhghh5/dayofficework/healthCheckup/list/index.html      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java
index 9600895c..7e7bba02 100644
--- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java
+++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java
@@ -205,9 +205,9 @@ public class SysHomeController {
             Date startDate = activity.getStartDate();
             Date endDate = activity.getEndDate();
             // 判断当前时间是否在活动范围内，不在就过滤掉
-            if (!DateUtil.isIn(today, startDate, endDate)) {
-                continue;
-            }
+//            if (!DateUtil.isIn(today, startDate, endDate)) {
+//                continue;
+//            }
 			// 只过滤结束的
 			if (DateUtil.compare(today, endDate) > 0) {
 				continue;
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/list/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/list/index.html
index de32bb79..c233cfa0 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/list/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/list/index.html
@@ -56,7 +56,7 @@ layout("/layouts/platform_h5.html"){
             </table-column>
         </template>
         <template #actions="{index,row}">
-            <template v-if="$moment().isBefore($moment(row.choiceTimeEnd))">
+            <template v-if="$moment(row.choiceTimeStart).isBefore($moment()) && $moment().isBefore($moment(row.choiceTimeEnd))">
                 <div class="action-btn" style="text-align: right" @click="onView(row)">
                     <i class="fa fa-edit"></i>
                     <span>去报名</span>