From fca06c9816a824027e6db9b5aab0ab8aa08d6c09 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 14 Mar 2023 14:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?real=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journal.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 74b26b26e..5f56b6f78 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -82,8 +82,8 @@ class Journal < ApplicationRecord
         content += "将标记由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
       end
     when 'assigner'
-      old_value = User.where(id: detail.old_value.split(",")).pluck(:nickname).join("、")
-      new_value = User.where(id: detail.value.split(",")).pluck(:nickname).join("、")
+      old_value = User.where(id: detail.old_value.split(",")).map{|u| u.real_name}.join("、")
+      new_value = User.where(id: detail.value.split(",")).map{|u| u.real_name}.join("、")
       if old_value.nil? || old_value.blank? 
         content += "添加负责人<b>#{new_value}</b>"
       else 
@@ -122,8 +122,8 @@ class Journal < ApplicationRecord
         new_value = detail.value 
         content += "结束日期"
       when 'assigned_to_id'
-        old_value = User.find_by_id(detail.old_value)&.nickname
-        new_value = User.find_by_id(detail.value)&.nickname
+        old_value = User.find_by_id(detail.old_value)&.real_name
+        new_value = User.find_by_id(detail.value)&.real_name
         content += "负责人"
       end
       if old_value.nil? || old_value.blank?