diff --git a/contest/views.py b/contest/views.py
index 7deb166..87378db 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -515,6 +515,10 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
         values("id", "contest_id", "problem_id", "result", "create_time",
                "accepted_answer_time", "language", "user_id").order_by("-create_time")
 
+    # 如果比赛已经开始，就不再显示之前测试题目的提交
+    if contest.status != CONTEST_NOT_START:
+        submissions = submissions.filter(create_time__gte=contest.start_time)
+
     user_id = request.GET.get("user_id", None)
     if user_id:
         submissions = submissions.filter(user_id=request.GET.get("user_id"))
diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html
index ce8fd14..010b73e 100644
--- a/template/src/admin/contest/add_contest.html
+++ b/template/src/admin/contest/add_contest.html
@@ -1,6 +1,9 @@
 <div ms-controller="add_contest">
     <form id="add-contest-form">
         <div class="col-md-9">
+            <div class="alert alert-warning" role="alert">
+                <p>注意！管理员在测试比赛题目的时候请务必保持比赛状态为没有开始，这时只有管理员可以正常查看和提交题目，而且不会产生排名。</p>
+            </div>
             <div class="col-md-12">
                 <label>比赛名称</label>
             </div>
diff --git a/template/src/admin/contest/edit_contest.html b/template/src/admin/contest/edit_contest.html
index 2afc849..08f7c09 100644
--- a/template/src/admin/contest/edit_contest.html
+++ b/template/src/admin/contest/edit_contest.html
@@ -6,6 +6,9 @@
                         aria-hidden="true">&larr;</span> 返回</a></li>
             </ul>
         </nav>
+        <div class="alert alert-warning" role="alert">
+                <p>注意！管理员在测试比赛题目的时候请务必保持比赛状态为没有开始，这时只有管理员可以正常查看和提交题目，而且不会产生排名。</p>
+            </div>
         <div class="col-md-12">
             <label>比赛名称</label>
         </div>