From 893c1c753f7f8e971deaa42b9aa1559a3e594b52 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 20 Aug 2015 18:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=95=99=E8=A8=80=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97=E5=9B=9E=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index bb59f612d..853376f6a 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -208,18 +208,28 @@ class JournalsForMessage < ActiveRecord::Base
         receivers << self.jour
       end
     else # 留言回复
-      # 添加留言回复人
       reply_to = User.find(self.reply_id)
-      if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id  # 如果回帖人不是用户自己
-        receivers << self.parent.user
+      if self.user_id != self.parent.user_id
+        receivers << reply_to
         if self.reply_id != self.parent.user_id
-          receivers << reply_to
-        end
-      else # 用户自己回复别人的，别人收到消息通知
-        if self.user_id != self.reply_id # 过滤掉自己回复自己的
-          receivers << reply_to
+          receivers << self.parent.user
         end
+      else
+        receivers << reply_to
       end
+
+      # 添加留言回复人
+      #reply_to = User.find(self.reply_id)
+      #if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id  # 如果回帖人不是用户自己
+      #  receivers << self.parent.user
+      #  if self.reply_id != self.parent.user_id
+      #    receivers << reply_to
+      #  end
+      #else # 用户自己回复别人的，别人收到消息通知
+      #  if self.user_id != self.reply_id # 过滤掉自己回复自己的
+      #    receivers << reply_to
+      #  end
+      #end
     end
     if self.jour_type == 'Principal'