diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index ab62cbd45..2612510c5 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -321,11 +321,12 @@ class StudentWorksController < ApplicationController
ActiveRecord::Base.transaction do
begin
- revise_attachment = @work.attachments.where(attachtype: 7).reorder("created_on desc").last
- if revise_attachment.present? && @work.student_works_scores.where("created_at > '#{revise_attachment.created_on}'
- and score is not null").count == 0
- revise_attachment.destroy
- end
+ # 补交作业附件不覆盖之前上传的附件
+ # revise_attachment = @work.attachments.where(attachtype: 7).reorder("created_on desc").last
+ # if revise_attachment.present? && @work.student_works_scores.where("created_at > '#{revise_attachment.created_on}'
+ # and score is not null").count == 0
+ # revise_attachment.destroy
+ # end
Attachment.associate_container(params[:attachment_ids], @work.id, @work.class, 7)
revise_attachment = Attachment.where(attachtype: 7, container_id: @work.id, container_type: "StudentWork").last
revise_attachment.update_attributes(description: params[:description]) if revise_attachment.present?
diff --git a/app/models/student_graduation_topic.rb b/app/models/student_graduation_topic.rb
index 50f150f92..b8f4dfbbb 100644
--- a/app/models/student_graduation_topic.rb
+++ b/app/models/student_graduation_topic.rb
@@ -21,7 +21,7 @@ class StudentGraduationTopic < ApplicationRecord
def send_tiding
self.tidings << Tiding.new(:user_id => self.graduation_topic.tea_id, :trigger_user_id => self.user_id, :parent_container_id => self.graduation_topic_id, :parent_container_type => "GraduationTopic",
- :belong_container_id => self.graduation_topic.course_id, :belong_container_type => "Course", :viewed => 0, :status => 0, :tiding_type => "GraduationTopic")
+ :belong_container_id => self.graduation_topic.course_id, :belong_container_type => "Course", :viewed => 0, :status => 0, :tiding_type => "Apply")
end
# 学生名称
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
index dc82de540..f41528657 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -248,7 +248,9 @@ class CommonWorkAppraise extends Component{
}
-