From f4f0a69873a3d893e998c7f5dbc73b8d39e39bbb Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 5 Jun 2019 15:42:41 +0800 Subject: [PATCH] 1 --- app/services/shixuns_service.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/services/shixuns_service.rb b/app/services/shixuns_service.rb index 707d1760..de4d75b3 100644 --- a/app/services/shixuns_service.rb +++ b/app/services/shixuns_service.rb @@ -81,7 +81,6 @@ class ShixunsService discusses = disscusses.limit(LIMIT).includes(:user, :praise_tread).offset(offset) end - base_data discusses, dis, current_user return {:children_list => @children_list, :disscuss_count => disscuss_count} end @@ -156,7 +155,7 @@ class ShixunsService if current_user.admin? Discuss.where(root_id: d.id).includes(:user).reorder("created_at asc") else - Discuss.where("root_id = :root_id and (hidden = :hidden or user_id = :user_id", + Discuss.where("root_id = :root_id and (hidden = :hidden or user_id = :user_id)", {root_id: d.id, hidden: false, user_id: current_user.id}).includes(:user).reorder("created_at asc") end