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 @@ <%= action.action_name %> <%= 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 %> <%= raw action.action_info %>