yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX bug

This commit is contained in:
jasder 2021-05-11 18:29:09 +08:00
parent 9f8a55fe12
commit 273a17861b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/services/forum_sections_service.rb
View File

@ -373,7 +373,7 @@ class ForumSectionsService
page = params[:page].to_i > 0 ? (params[:page].to_i - 1) : 0 page = params[:page].to_i > 0 ? (params[:page].to_i - 1) : 0
offset = page * LIMIT offset = page * LIMIT
memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq # memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq
memos_all = Memo.where(hidden:true, published_at: nil, parent_id: nil, forum_section_id: select_section_ids).order("created_at desc") memos_all = Memo.where(hidden:true, published_at: nil, parent_id: nil, forum_section_id: select_section_ids).order("created_at desc")
# memos_all = Memo.where(hidden: true, parent_id: nil, id: memo_forum_section_ids).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})").order("created_at desc") # memos_all = Memo.where(hidden: true, parent_id: nil, id: memo_forum_section_ids).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})").order("created_at desc")
@ -415,7 +415,7 @@ class ForumSectionsService
return {status: -1, message: "请登录"} unless check_user_permission(current_user, params[:id]) return {status: -1, message: "请登录"} unless check_user_permission(current_user, params[:id])
select_section_ids = [params[:id]] select_section_ids = [params[:id]]
unless @forum_section.parent_id.present? # unless @forum_section.parent_id.present?
children_forums = @forum_section.child_ids children_forums = @forum_section.child_ids
select_section_ids = select_section_ids + children_forums select_section_ids = select_section_ids + children_forums
# end # end
@ -427,7 +427,8 @@ class ForumSectionsService
offset = page * LIMIT offset = page * LIMIT
#全部的父帖子 #全部的父帖子
parent_memos_ids = Memo.where(parent_id: nil).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})").pluck(:id).uniq parent_memos_ids = Memo.where(parent_id: nil).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})").pluck(:id).uniq
memos_all = Memo.where(hidden:true,published_at: nil, parent_id: parent_memos_ids).order("created_at ASC") # memos_all = Memo.where(hidden:true,published_at: nil, parent_id: parent_memos_ids).order("created_at ASC")
memos_all = Memo.where(hidden:true, published_at: nil, parent_id: nil, forum_section_id: select_section_ids).order("created_at desc")
memos_count = memos_all.size memos_count = memos_all.size
memos = memos_all.limit(LIMIT).offset(offset) memos = memos_all.limit(LIMIT).offset(offset)
@ -472,7 +473,7 @@ class ForumSectionsService
offset = page * LIMIT offset = page * LIMIT
#全部的父帖子 #全部的父帖子
memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq # memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq
memos_all = Memo.where(hidden: false,parent_id: nil, forum_section_id: select_section_ids).order("created_at desc") memos_all = Memo.where(hidden: false,parent_id: nil, forum_section_id: select_section_ids).order("created_at desc")
# memos_all = Memo.where(hidden: false, parent_id: nil).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})") # memos_all = Memo.where(hidden: false, parent_id: nil).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})")
if params[:type].present? if params[:type].present?