diff --git a/submission/views.py b/submission/views.py
index fed235a6..39aa5b8e 100644
--- a/submission/views.py
+++ b/submission/views.py
@@ -85,7 +85,7 @@ def problem_my_submissions_list_page(request, problem_id):
         problem = Problem.objects.get(id=problem_id, visible=True)
     except Problem.DoesNotExist:
         return error_page(request, u"问题不存在")
-    submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id).order_by("-create_time").\
+    submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id).order_by("-create_time"). \
         values("id", "result", "create_time", "accepted_answer_time", "language")
     return render(request, "oj/problem/my_submissions_list.html",
                   {"submissions": submissions, "problem": problem})
@@ -117,7 +117,6 @@ def my_submission(request, submission_id):
                   {"submission": submission, "problem": problem, "info": info})
 
 
-
 class SubmissionAdminAPIView(APIView):
     def get(self, request):
         problem_id = request.GET.get("problem_id", None)
@@ -126,11 +125,13 @@ class SubmissionAdminAPIView(APIView):
         submissions = Submission.objects.filter(problem_id=problem_id).order_by("-create_time")
         return paginate(request, submissions, SubmissionSerializer)
 
+
 @login_required
-def my_submission_list_page(request, page = 1):
+def my_submission_list_page(request, page=1):
     if not page:
-	    page = 1
-    submissions = Submission.objects.filter(user_id=request.user.id)
+        page = 1
+    submissions = Submission.objects.filter(user_id=request.user.id). \
+        values("id", "result", "create_time", "accepted_answer_time", "language")
     paginator = Paginator(submissions, 20)
     try:
         current_page = paginator.page(int(page))
diff --git a/template/oj/submission/my_submissions_list.html b/template/oj/submission/my_submissions_list.html
index e13d978b..259f176a 100644
--- a/template/oj/submission/my_submissions_list.html
+++ b/template/oj/submission/my_submissions_list.html
@@ -10,7 +10,9 @@
         <li role="presentation" class="active">
             <a href="/submission/my_submissions/">我的提交</a></li>
     </ul>
+
     <br>
+    {% if submissions %}
     <table class="table table-bordered">
         <thead>
         <tr class="" success>
@@ -24,7 +26,8 @@
         <tbody>
         {% for item in submissions %}
         <tr class="{{ item.result|translate_result_class }}">
-            <th scope="row"><a href="/my_submission/{{ item.id }}/">{{ item.id }}</a></th>
+            <th scope="row"><a href="/my_submission/{{ item.id }}/" id="id_{{ forloop.counter }}">{{ forloop.counter
+                }}</a></th>
             <td>{{ item.create_time }}</td>
             <td>{{ item.result|translate_result }}</td>
             <td>
@@ -42,6 +45,9 @@
 
         </tbody>
     </table>
+    {% else %}
+    <p>你还没有提交记录!</p>
+    {% endif %}
     <nav>
         <ul class="pager">
             {% if previous_page %}
@@ -57,4 +63,12 @@
         </ul>
     </nav>
 </div>
+<script>
+    for (var i = 1; true; i++) {
+        if (!document.getElementById("id_"+i)) break;
+        document.getElementById("id_"+i).innerHTML= ""+(i+{{page}}*20-20);
+    }
+
+
+</script>
 {% endblock %}