diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index c2499e824..9d51e5839 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -978,7 +978,11 @@ class AdminController < ApplicationController
   #作业
   def homework
     #@homework = HomeworkCommon.order('end_time desc')
-    @homework = HomeworkCommon.order( 'created_at desc ')
+    if params[:type] == "2"
+      @homework = HomeworkCommon.where(:homework_type => 2).order( 'created_at desc ')
+    else
+      @homework = HomeworkCommon.order( 'created_at desc ')
+    end
     @homework = paginateHelper @homework,30
     @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index aaf21999d..1582193b2 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -1,7 +1,7 @@
 <h3>
   <%=l(:label_user_homework)%>
 </h3>
-
+<p><%= link_to "编程作业", admin_homework_path(:type => "2")  %></p>
 <div class="autoscroll">
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>