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 @@ 序号 操作类型 + 操作人 账号 邮箱 手机号 @@ -17,6 +18,7 @@ <%= list_index_no((params[:page] || 1).to_i, index) %> <%= action.action_name %> + <%= action.opt_user_name %> <%= link_to "/#{action.user&.login}", target: '_blank' do %> <%= overflow_hidden_span action.user&.login, width: 100 %>