From 6924366e022b40b1929e715338543bfb6b62969c Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 27 Sep 2024 11:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4,=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=94=A8=E6=88=B7=E4=BB=85=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user_action.rb                                | 7 ++++---
 app/views/admins/user_actions/_user_action_list.html.erb | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 0df146bd9..8f8df75bf 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -40,10 +40,11 @@ class UserAction < ApplicationRecord
   end
 
   def opt_user_name
-    if user&.id == user_id
-      "--"
+    user = User.find_by(id: self.user_id)
+    if user.present?
+      user&.login
     else
-      User.find_by(id: self.user_id)&.login
+      "不存用户：#{action_id}"
     end
   end
 
diff --git a/app/views/admins/user_actions/_user_action_list.html.erb b/app/views/admins/user_actions/_user_action_list.html.erb
index 0af34be7d..2df720b60 100644
--- a/app/views/admins/user_actions/_user_action_list.html.erb
+++ b/app/views/admins/user_actions/_user_action_list.html.erb
@@ -17,7 +17,7 @@
         <td><%= action.action_name %></td>
         <td>
           <%= link_to "/#{action.user&.login}", target: '_blank' do %>
-            <%= overflow_hidden_span action.user&.login, width: 100 %>
+            <%= overflow_hidden_span action.opt_user_name, width: 100 %>
           <% end %></td>
         <td>
           <%=  raw action.action_info %>