From fe431902d70cce85acee1fb1df9a9f2305d46e17 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Sun, 18 Sep 2016 16:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80=E7=9A=84at?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9B=B8=E5=85=B3BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/at_message.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/at_message.rb b/app/models/at_message.rb
index 2212ef07e..10afe3e79 100644
--- a/app/models/at_message.rb
+++ b/app/models/at_message.rb
@@ -99,7 +99,7 @@ class AtMessage < ActiveRecord::Base
         else
           type = "journal_for_message"
           detail_id = topic.id
-          detail_title = at_message.notes
+          detail_title = topic.notes.nil? ? "" : topic.notes
         end
       else
         status = -1