消息留言发送:回复东家,回复人和东家只能一人收到消息
This commit is contained in:
parent
b5dc6cabef
commit
a7eff50c61
|
@ -212,33 +212,11 @@ class JournalsForMessage < ActiveRecord::Base
|
|||
if self.user_id != self.reply_id # 添加我回复的那个人
|
||||
receivers << reply_to
|
||||
end
|
||||
if self.user_id != self.parent.jour_id # 给东家发信息
|
||||
if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息,如果回复的对象是东家则不发
|
||||
receivers << self.parent.jour
|
||||
end
|
||||
# if self.user_id != self.parent.user_id
|
||||
# receivers << reply_to
|
||||
# if self.reply_id != self.parent.user_id
|
||||
# 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'
|
||||
|
||||
receivers.each do |r|
|
||||
self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
|
||||
end
|
||||
|
|
|
@ -263,6 +263,7 @@ class User < Principal
|
|||
user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count
|
||||
messages_count = course_count + forge_count + user_feedback_count + user_memo_count
|
||||
end
|
||||
|
||||
# 查询指派给我的缺陷记录
|
||||
def issue_status_update
|
||||
self.status_updates
|
||||
|
|
Loading…
Reference in New Issue