diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index c7c572cff..cb8e7edf9 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -34,7 +34,11 @@
         <% if @homework.homework_type == 3 %>
             <span id="min_num_member" style="display: none"><%=@homework.homework_detail_group.min_num %></span>
             <span id="max_num_member" style="display: none"><%=@homework.homework_detail_group.max_num %></span>
-            <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
+            <% str = User.current.id.to_s%>
+            <% @work.student_work_projects.where("is_leader = ?", 0).each do |pro| %>
+                <% str += ','+pro.user_id.to_s %>
+            <% end %>
+            <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>str %>
         <% end %>
         <div>
           <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 265118def..a060cf386 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -26,14 +26,18 @@
     <% end %>
     <div class="calendar_div fl mr10">
       <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')%>
+      <% if homework.homework_detail_manual.comment_status.to_i < 3 %>
+        <%= calendar_for('homework_end_time')%>
+      <% end %>
     </div>
     <% if edit_mode %>
         <label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>
     <% end %>
     <div class="calendar_div fl">
       <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
-      <%= calendar_for('homework_publish_time')%>
+      <% if homework.homework_detail_manual.comment_status.to_i == 0 %>
+        <%= calendar_for('homework_publish_time')%>
+      <% end %>
     </div>
   </div>
   <div class="cl"></div>