From f4525d6744a0e4d1a73177f1b557a9454c27ab0a Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 27 Sep 2024 10:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user_action.rb                                | 8 ++++++++
 app/views/admins/user_actions/_user_action_list.html.erb | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index cf797cfce..07369dba9 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -47,6 +47,14 @@ class UserAction < ApplicationRecord
     end
   end
 
+  def opt_user_name
+    if user&.id == user_id
+      "--"
+    else
+      User.find_by(id: self.user_id)&.login
+    end
+  end
+
   def user
     action_user = if action_type == "DestroyUser" && data_bank.present?
                     build_mode("User")
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 0682e9036..d19cdbc64 100644
--- a/app/views/admins/user_actions/_user_action_list.html.erb
+++ b/app/views/admins/user_actions/_user_action_list.html.erb
@@ -3,6 +3,7 @@
   <tr>
     <th width="5%" class="text-center">序号</th>
     <th width="10%">操作类型</th>
+    <th width="10%" title="--本人操作，有名称为管理员操作">操作人</th>
     <th width="10%" class="text-left">账号</th>
     <th width="15%" class="text-left">邮箱</th>
     <th width="10%" class="text-left">手机号</th>
@@ -17,6 +18,7 @@
       <tr class="user-item-<%= action.user&.id %>">
         <td class="text-center"><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td><%= action.action_name %></td>
+        <td><%= action.opt_user_name %></td>
         <td>
           <%= link_to "/#{action.user&.login}", target: '_blank' do %>
             <%= overflow_hidden_span action.user&.login, width: 100 %>