diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 8b37ca8e4..6e6fa7d20 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -151,7 +151,7 @@ class HomeworkCommonController < ApplicationController
     @homework.description = params[:homework_common][:description]
     @homework.end_time = params[:homework_common][:end_time]
     @homework.publish_time = params[:homework_common][:publish_time]
-    @homework.homework_type = params[:homework_common][:homework_type]
+    @homework.homework_type = params[:homework_common][:homework_type] if params[:homework_common][:homework_type]
     unless @homework.late_penalty == params[:late_penalty]
       @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work|
         student_work.late_penalty = params[:late_penalty]
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 20cdc6659..dae0bcab6 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -13,8 +13,9 @@ class StudentWorkController < ApplicationController
   def index
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
-    unless @group == "0" || @group.nil?
-      group_students = CourseGroup.find_by_id(@group).users
+    course_group = CourseGroup.find_by_id(@group) if @group
+    if course_group
+      group_students = course_group.users
       if group_students.empty?
         student_in_group = '(0)'
       else
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 7e4a818a9..781277b57 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -48,9 +48,9 @@
         <%= link_to "所有作品(<span class='c_red'>#{@stundet_works.count}</span>)".html_safe,student_work_index_path(:homework => @homework.id), :class => "fl"%>
       </span>
       <% if @show_all%>
-        <input  type="text" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName($(this).val(),$(this).next().val(),'<%= student_work_index_path(:homework => @homework.id)%>',event);">
-        <%= select_tag(:late_penalty,options_for_select(course_group_list(@course),@group), {:class => "fl h22 w100 ml10"}) if @is_teacher  %>
-        <a class="student_work_search fl" onclick="SearchByName_1($(this).prev().prev().val(),$(this).prev().val(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
+        <input  type="text" id="course_student_name" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);">
+        <%= select_tag(:late_penalty,options_for_select(course_group_list(@course),@group), {:class => "fl h22 w100 ml10"}) if(@is_teacher && course_group_list(@course).count > 0)  %>
+        <a class="student_work_search fl" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
         <%= link_to("缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank") if((@is_teacher || User.current.admin?) && @homework.homework_type == 1) %>
       <% end%>
       <% if @is_teacher%>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index db1f761f2..7c165a4c6 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -861,14 +861,19 @@ function clickOK(path)
     });
 }
 //查询
-function SearchByName(name,group,url,event)
+function SearchByName(url,event)
 {
     var keycode = (event.keyCode ? event.keyCode : event.which);
     if(keycode == '13'){
-        location.href = url + "&name=" + name + "&group=" + group;
+        location.href = url + "&name=" + $("#course_student_name").val() + "&group=" + $("#late_penalty").val();
     }
 }
-function SearchByName_1(name,group,url)
+function SearchByName_1(url)
 {
-    location.href = url + "&name=" + name + "&group=" + group;
+    if($("#late_penalty").val() == null){
+        location.href = url + "&name=" + $("#course_student_name").val()
+    }
+    else{
+        location.href = url + "&name=" + $("#course_student_name").val() + "&group=" + $("#late_penalty").val();
+    }
 }