Merge branch 'cxt_course' into develop

cxt_course v20160926_01
cxt 9 years ago
commit 8a35c606da

@ -3246,12 +3246,12 @@ end
#获取所有子节点 #获取所有子节点
def get_all_children result, jour 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| jour.children.includes(:author, :praise_tread_cache).each do |jour_child|
result << jour_child result << jour_child
get_all_children result, jour_child get_all_children result, jour_child
end 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| jour.children.each do |jour_child|
result << jour_child result << jour_child
get_all_children result, jour_child get_all_children result, jour_child

Loading…
Cancel
Save