安全学习待办、sse、统计、列表

src/main/resources/mapper/securityManagement/HotTrainingParticipantMapper.xml

@@ -25,15 +25,12 @@
           AND p.user_id = #{userId}
           AND p.is_deleted = 0
           AND t.is_enabled = 1
+          AND t.start_time IS NOT NULL
+          AND t.end_time IS NOT NULL
+          AND t.start_time <= #{now}
           AND (
-            t.is_make_up = 1
-                OR (
-                (t.is_make_up IS NULL OR t.is_make_up !=1)
-                    AND t.start_time IS NOT NULL
-                    AND t.end_time IS NOT NULL
-                    AND t.start_time <= #{now}
-                    AND t.end_time >= #{now}
-                )
+            t.end_time >= #{now}
+                OR (t.end_time < #{now} AND t.is_make_up = 1)
             )
         ORDER BY t.start_time DESC, p.id DESC
     </select>