diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index e296faad..36fa12e9 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
@@ -252,6 +252,7 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video video,
         t_compete_project_player pp,
         t_compete_player player,
         t_compete_group competeGroup
@@ -260,12 +261,16 @@
         AND score.project_id = #{projectId}
         AND score.site_order_id = startOrder.id
         AND startOrder.player_id = pp.id
+        AND video.project_id = startOrder.project_id
+        AND video.player_id = startOrder.player_id
         AND pp.player_id = player.id
         AND player.compete_group_id = competeGroup.id
+        AND startOrder.waiver = 0
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
         AND competeGroup.rec_status = 0
+        AND video.rec_status = 0
         ORDER BY
         competeGroup.id,
         score.final_score
@@ -279,6 +284,7 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video video,
         t_compete_project_player pp,
         t_compete_player player,
         t_compete_group competeGroup
@@ -287,12 +293,16 @@
         AND score.project_id = #{projectId}
         AND score.site_order_id = startOrder.id
         AND startOrder.player_id = pp.id
+        AND video.project_id = startOrder.project_id
+        AND video.player_id = startOrder.player_id
         AND pp.player_id = player.id
         AND player.compete_group_id = competeGroup.id
+        AND startOrder.waiver = 0
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
         AND competeGroup.rec_status = 0
+        AND video.rec_status = 0
         ORDER BY
         competeGroup.id,
         score.final_score
@@ -321,6 +331,7 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video video,
         t_compete_team team,
         t_compete_team_member tm,
         t_compete_player player
@@ -329,13 +340,17 @@
         AND score.project_id = #{projectId}
         AND score.site_order_id = startOrder.id
         AND startOrder.player_id = team.id
+        AND video.project_id = startOrder.project_id
+        AND video.player_id = startOrder.player_id
         AND team.id = tm.compete_team_id
         AND tm.player_id = player.id
+        AND startOrder.waiver = 0
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
         AND team.rec_status = 0
         AND tm.rec_status = 0
+        AND video.rec_status = 0
         group by score.id) t1,
 
         (SELECT
@@ -349,6 +364,7 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video video,
         t_compete_team team,
         t_compete_team_member tm,
         t_compete_player player
@@ -357,13 +373,17 @@
         AND score.project_id = #{projectId}
         AND score.site_order_id = startOrder.id
         AND startOrder.player_id = team.id
+        AND video.project_id = startOrder.project_id
+        AND video.player_id = startOrder.player_id
         AND team.id = tm.compete_team_id
         AND tm.player_id = player.id
+        AND startOrder.waiver = 0
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
         AND team.rec_status = 0
         AND tm.rec_status = 0
+        AND video.rec_status = 0
         group by score.id) t2
         WHERE
         t1.group_name = t2.group_name
@@ -407,6 +427,7 @@
 	site_order_id
 	) t,
 	t_compete_start_order o,
+	t_compete_video video,
 	(SELECT
 			t.id,
 			CONCAT(
@@ -431,6 +452,10 @@
 	WHERE
 	t.site_order_id = o.id
 	AND o.player_id = team.id
+	AND o.waiver = 0
+	AND video.project_id = o.project_id
+	AND video.player_id = o.player_id
+	AND video.rec_status = 0
 	AND o.rec_status = 0
 	order by t. final_score desc
 	limit 8