From 4d0ed530b71ce9b872ac69c381288d3cb2e3d7cd Mon Sep 17 00:00:00 2001
From: feng <281221230@qq.com>
Date: Thu, 23 Jan 2025 10:08:06 +0800
Subject: [PATCH] =?UTF-8?q?nps=20=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/nps_controller.rb    | 2 +-
 app/views/admins/nps/_user_np_list.html.erb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb
index bfb72f730..2817cd0c6 100644
--- a/app/controllers/admins/nps_controller.rb
+++ b/app/controllers/admins/nps_controller.rb
@@ -2,7 +2,7 @@ class Admins::NpsController < Admins::BaseController
   before_action :require_business
   def index
     @on_off_switch = EduSetting.get("nps-on-off-switch").to_s == 'true'
-    @user_nps = UserNp.joins(:user).order(created_at: :desc)
+    @user_nps = UserNp.order(created_at: :desc)
     keyword = params[:keyword].to_s.strip.presence
     if keyword
       sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword'
diff --git a/app/views/admins/nps/_user_np_list.html.erb b/app/views/admins/nps/_user_np_list.html.erb
index f2d5196e9..474fe8b86 100644
--- a/app/views/admins/nps/_user_np_list.html.erb
+++ b/app/views/admins/nps/_user_np_list.html.erb
@@ -12,15 +12,15 @@
   <tbody>
   <% if user_nps.present? %>
     <% user_nps.each_with_index do |nps, index| %>
-      <tr class="user-item-<%= nps.user.id %>">
+      <tr class="user-item-<%= nps.user.nil? ? "用户已注销" : nps.user.id %>">
         <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td class="text-left">
-          <%= link_to "/#{nps.user.login}", target: '_blank' do %>
-            <%= overflow_hidden_span nps.user.real_name, width: 100 %>
+          <%= link_to "/#{nps.user.nil? ? "用户已注销" : nps.user.login}", target: '_blank' do %>
+            <%= overflow_hidden_span (nps.user.nil? ? "用户已注销" : nps.user.real_name), width: 100 %>
           <% end %>
         </td>
         <td><%= display_text(nps.created_at&.strftime('%Y-%m-%d %H:%M')) %></td>
-        <td><%= display_text(nps.user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
+        <td><%= display_text(nps.user.nil? ? "用户已注销" : nps.user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
         <td><%= nps.action_type == 'close' ? '--' : nps.score %></td>
         <td><%= nps.memo %></td>
       </tr>