From 1fa2fe4ad3b6ffc0d2adee088eb2e4980f118ae1 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 13 Jan 2020 14:37:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD=E7=9A=84api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users/interests_controller.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users/interests_controller.rb b/app/controllers/users/interests_controller.rb
index 93f2345f1..06470f553 100644
--- a/app/controllers/users/interests_controller.rb
+++ b/app/controllers/users/interests_controller.rb
@@ -9,18 +9,18 @@ class Users::InterestsController < Users::BaseController
     extension = current_user.user_extension || current_user.build_user_extension
     return render_error('请选择职业') unless %w(teacher student professional).include?(identity)
 
-    interest_ids = Array.wrap(params[:interest_ids]).map(&:to_i)
-    return render_error('请选择兴趣') if interest_ids.blank?
+    # interest_ids = Array.wrap(params[:interest_ids]).map(&:to_i)
+    # return render_error('请选择兴趣') if interest_ids.blank?
 
     ActiveRecord::Base.transaction do
       extension.update_column(:identity, identity)
 
       # 兴趣
-      UserInterest.bulk_insert(:user_id, :repertoire_id) do |worker|
-        (Repertoire.pluck(:id) & interest_ids).each do |repertoire_id|
-          worker.add(user_id: current_user.id, repertoire_id: repertoire_id)
-        end
-      end
+      # UserInterest.bulk_insert(:user_id, :repertoire_id) do |worker|
+      #   (Repertoire.pluck(:id) & interest_ids).each do |repertoire_id|
+      #     worker.add(user_id: current_user.id, repertoire_id: repertoire_id)
+      #   end
+      # end
     end
 
     render_ok

From 2e6222bca279fbfc70dd83d25d6607a18d1b70f2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 13 Jan 2020 15:23:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/hacks_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/hacks_controller.rb b/app/controllers/hacks_controller.rb
index 0e98e771b..6eb454feb 100644
--- 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]