diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4f3df3bd4..73a26b52c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -358,6 +358,7 @@ class UsersController < ApplicationController
 
   #导入作业
   def user_import_homeworks
+    @select_course = params[:select_course] ? 1 : 0
     @user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
     respond_to do |format|
       format.js
@@ -377,6 +378,7 @@ class UsersController < ApplicationController
     homework = HomeworkCommon.find_by_id params[:checkMenu]
     homework_detail_programing = homework.homework_detail_programing
     @homework = HomeworkCommon.new
+    @select_course = params[:select_course] || 0
     if homework
       @homework.name = homework.name
       @homework.description = homework.description
diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb
index c14278de3..935cc4513 100644
--- a/app/views/users/_show_user_homeworks.html.erb
+++ b/app/views/users/_show_user_homeworks.html.erb
@@ -10,6 +10,7 @@
     <% end%>
   </div>
   <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
+      <input type="hidden" name="select_course" value="<%= @select_course%>">
       <div class="homeworkListForm mb10 " id="homework_list_form_show">
         <%= render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks}%>
       </div>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index fe320992a..6167e4e10 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -16,7 +16,7 @@
   <div class="cl"></div>
 
   <div class=" mt10">
-    <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
+    <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
     <div class="calendar_div fl">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index 308f74938..1d9cc8d70 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -2,7 +2,9 @@
 hideModal('#coursesChoosePopup');
 $("#homework_name").val("<%= @homework.name%>");
 $("#homework_end_time").val("<%= @homework.end_time%>");
-$("#course_id").val("<%= @homework.course_id%>");
+<% if @select_course == "0"%>
+    $("#course_id").val("<%= @homework.course_id%>");
+<% end%>
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
 $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");