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 += "将标记由#{old_value}更改为#{new_value}" 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 += "添加负责人#{new_value}" 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?