|
|
|
@@ -31,16 +31,16 @@ class MessageTemplate::IssueChanged < MessageTemplate |
|
|
|
change_count = change_params.keys.size |
|
|
|
# 疑修负责人修改 |
|
|
|
if change_params[:assigned_to_id].present? |
|
|
|
assigner1 = User.find_by_id(change_params[:assigned_to_id][0]) |
|
|
|
assigner2 = User.find_by_id(change_params[:assigned_to_id][1]) |
|
|
|
assigner1 = User.where(id: change_params[:assigned_to_id][0]) |
|
|
|
assigner2 = User.where(id: change_params[:assigned_to_id][1]) |
|
|
|
if change_count > 1 |
|
|
|
content.sub!('{ifassigner}', '<br/>') |
|
|
|
else |
|
|
|
content.sub!('{ifassigner}', '') |
|
|
|
end |
|
|
|
content.sub!('{endassigner}', '') |
|
|
|
content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员') |
|
|
|
content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员') |
|
|
|
content.gsub!('{assigner1}', assigner1.present? ? assigner1.map{|a| a&.real_name}.join("、") : '未指派成员') |
|
|
|
content.gsub!('{assigner2}', assigner2.present? ? assigner2.map{|a| a&.real_name}.join("、") : '未指派成员') |
|
|
|
else |
|
|
|
content.gsub!(/({ifassigner})(.*)({endassigner})/, '') |
|
|
|
end |
|
|
|
@@ -217,8 +217,8 @@ class MessageTemplate::IssueChanged < MessageTemplate |
|
|
|
content.sub!('{ifassigner}', '') |
|
|
|
end |
|
|
|
content.sub!('{endassigner}', '') |
|
|
|
content.gsub!('{assigner1}', assigner1.present? ? assigner1.map{|a| a&.real_name}.join("、") : '无') |
|
|
|
content.gsub!('{assigner2}', assigner2.present? ? assigner2.map{|a| a&.real_name}.join("、") : '无') |
|
|
|
content.gsub!('{assigner1}', assigner1.present? ? assigner1.map{|a| a&.real_name}.join("、") : '未指派成员') |
|
|
|
content.gsub!('{assigner2}', assigner2.present? ? assigner2.map{|a| a&.real_name}.join("、") : '未指派成员') |
|
|
|
else |
|
|
|
content.gsub!(/({ifassigner})(.*)({endassigner})/, '') |
|
|
|
end |
|
|
|
|