Merge branch 'develop' into szzh

app/views/student_work/_programing_work_show.html.erb

@@ -49,7 +49,7 @@
               </td>
               <td class="td_50 c_red"><%= test.student_work_test.nil? ? "正在编译" : test.student_work_test.status_to_s%></td>
               <td class="td_50 "><%= test.student_work_test.nil? ? "0" : test.student_work_test.test_score%></td>
-              <input type="hidden" value="<%= test.student_work_test.result%>">
+              <input type="hidden" value="<%= test.student_work_test.result if test.student_work_test%>">
             </tr>
         <% end%>