全部包括我的未发布的

5 years ago · b97b314deb
parent dc4270c0b6
commit b97b314deb
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/hacks_controller.rb
+++ b/app/controllers/hacks_controller.rb
@ -163,7 +163,7 @@ class HacksController < ApplicationController
      hacks = Hack.select(select_sql).mine(current_user.id)
    else
      # 全部包括已经发布的，和我的未发布的
-      hacks = Hack.select(select_sql).published.opening.merge(Hack.select(select_sql).unpublish.mine(current_user.id))
+      hacks = Hack.select(select_sql).published.opening.or(Hack.select(select_sql).unpublish.mine(current_user.id))
    end
    # 搜索
    if params[:search]