Merge branch 'develop' into dev_aliyun

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