Merge branch 'cxt_course' into develop

This commit is contained in:
cxt 2016-09-26 09:05:22 +08:00
commit 8a35c606da
1 changed files with 2 additions and 2 deletions

View File

@ -3246,12 +3246,12 @@ end
#获取所有子节点
def get_all_children result, jour
if jour.kind_of? JournalsForMessage
if jour.kind_of? Message
jour.children.includes(:author, :praise_tread_cache).each do |jour_child|
result << jour_child
get_all_children result, jour_child
end
elsif (jour.kind_of? Message) || (jour.kind_of? BlogComment) || (jour.kind_of? OrgDocumentComment)
elsif (jour.kind_of? JournalsForMessage) || (jour.kind_of? BlogComment) || (jour.kind_of? OrgDocumentComment)
jour.children.each do |jour_child|
result << jour_child
get_all_children result, jour_child