From f7a9f3f5e9e1bd34e483f570002c93f07cddaf96 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 20 Sep 2019 16:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/graduation_work.rb              | 2 +-
 app/models/student_work.rb                 | 2 +-
 app/views/student_works/show.json.jbuilder | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/graduation_work.rb b/app/models/graduation_work.rb
index 235bfcac6..c0db92483 100644
--- a/app/models/graduation_work.rb
+++ b/app/models/graduation_work.rb
@@ -48,7 +48,7 @@ class GraduationWork < ApplicationRecord
 
   def delete_atta atta
     last_score = graduation_work_scores.where.not(score: nil).last
-    atta.author_id == user_id && (!last_score.present? || last_score.try(:created_at) < atta.created_on)
+    (atta.author_id == self.user_id) && (last_score.blank? || last_score.try(:created_at) < atta.created_on)
   end
 
   # 分班名
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 9c9efa17c..670990c34 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -106,7 +106,7 @@ class StudentWork < ApplicationRecord
 
   def delete_atta atta
     last_score = student_works_scores.where.not(score: nil).last
-    atta.author_id == user_id && (!last_score.present? || last_score.try(:created_at) < atta.created_on)
+    (atta.author_id == self.user_id) && (last_score.blank? || last_score.try(:created_at) < atta.created_on)
   end
 
   # 作品总体评价
diff --git a/app/views/student_works/show.json.jbuilder b/app/views/student_works/show.json.jbuilder
index 192e4d8ec..9bafbe93e 100644
--- a/app/views/student_works/show.json.jbuilder
+++ b/app/views/student_works/show.json.jbuilder
@@ -11,7 +11,7 @@ json.update_user_name @is_evaluation ? "匿名" : @work.update_user.try(:real_na
 json.update_atta @homework.late_duration && @is_author
 
 json.attachments @attachments do |atta|
-  json.partial! "attachments/attachment_simple", locals: {attachment: atta, delete: @work.delete_atta(atta)}
+  json.partial! "attachments/attachment_simple", locals: {attachment: atta, delete: false}
 end
 
 unless @is_evaluation