From 7108e6d763d97be0aaba63088b890b60034900bc Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 25 Mar 2016 09:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 123f1fc96..ed7dad53f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1213,8 +1213,8 @@ class UsersController < ApplicationController
                                                  params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
       join_course_messages.update_all(:viewed => true)
     end
-    shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
-    shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
+    shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+    shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
     user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"