Merge pull request #101 from NJUPT-SAST/dev-mio

Dev mio
NJUPT-SAST · Dec 11, 2023 · f81fcbc · f81fcbc
2 parents 45b3af6 + 774ac15
commit f81fcbc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/sast/evento/service/FeedBackService.java b/src/main/java/sast/evento/service/FeedBackService.java
@@ -40,4 +40,4 @@ public interface FeedBackService {
     // 管理端获取活动及其反馈数量列表
     PageModel<FeedbackNumModel> getFeedbackEvents(Integer page, Integer size);
 
-}
+}
diff --git a/src/main/resources/mapper/eventModelMapper.xml b/src/main/resources/mapper/eventModelMapper.xml
@@ -130,7 +130,9 @@
     <!--    最新的活动列表（按开始时间正序排列未开始的活动）-->
     <select id="getNewest" resultMap="eventModelMap">
         <include refid="selectFrom" />
-        WHERE e.state = 1
+        <!-- state 小于等于 2。 -->
+        <!-- 未开始 或 报名中 的活动。 -->
+        WHERE e.state &lt;= 2
         ORDER BY e.gmt_event_start ASC
     </select>
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,4 +40,4 @@ public interface FeedBackService { @@
         // 管理端获取活动及其反馈数量列表
         PageModel<FeedbackNumModel> getFeedbackEvents(Integer page, Integer size);
-    }
+    }