From 4002245601f2f9f6e67d89f994245af642780c65 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 9 Oct 2024 15:31:17 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=20=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6issue=EF=BC=8Cpr=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=B2=E6=B3=A8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                 |  4 ++--
 app/views/api/v1/issues/_detail.json.jbuilder     | 12 ++----------
 app/views/api/v1/users/_simple_user.json.jbuilder |  5 +++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d670e9a0d..a54d345fa 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -148,9 +148,9 @@ module ApplicationHelper
     if File.exist?(disk_filename(source&.class, source&.id))
       ctime = File.ctime(disk_filename(source.class, source.id)).to_i
       if %w(User Organization).include?(source.class.to_s)
-        File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+        File.join("images", relative_path, ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
       else
-        File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+        File.join("images/avatars", ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
       end
     elsif source.class.to_s == 'User'
       source.get_letter_avatar_url
diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder
index 8b5ff5949..941245b8c 100644
--- a/app/views/api/v1/issues/_detail.json.jbuilder
+++ b/app/views/api/v1/issues/_detail.json.jbuilder
@@ -27,18 +27,10 @@ json.milestone do
   end
 end
 json.author do
-  if issue.user.present? 
-    json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
-  else 
-    json.nil! 
-  end
+  json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
 end
 json.changer do 
-  if issue.changer.present? 
-    json.partial! "api/v1/users/simple_user", locals: {user: issue.changer}
-  else 
-    json.nil! 
-  end
+  json.partial! "api/v1/users/simple_user", locals: {user: issue.changer}
 end
 json.assigners issue.show_assigners.each do |assigner| 
   json.partial! "api/v1/users/simple_user", locals: {user: assigner}
diff --git a/app/views/api/v1/users/_simple_user.json.jbuilder b/app/views/api/v1/users/_simple_user.json.jbuilder
index 5e8e970e7..f79729046 100644
--- a/app/views/api/v1/users/_simple_user.json.jbuilder
+++ b/app/views/api/v1/users/_simple_user.json.jbuilder
@@ -4,6 +4,7 @@ if user.present?
   json.name user.real_name
   json.login user.login
   json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(user).to_s
-else 
-  json.nil!
+else
+  json.name "已注销"
+  json.login ""
 end
\ No newline at end of file