From b3b0461a424f2d6b1a6ec3b3174b153a93ccd194 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 10 Apr 2015 16:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E8=A2=AB=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=B0=B1=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users_service.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 8f86029d9..63dd725cd 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -199,13 +199,15 @@ class UsersService
 
   #搜索用户
   def search_user params
-    @status = params[:status] || 1
+    status = params[:status] || 1
     has = {
         "show_changesets" => true
     }
-    scope = User.logged.status(@status)
-    @search_by = params[:search_by] ? params[:search_by] : "0"
-    scope = scope.like(params[:name],@search_by) if params[:name].present?
+    scope = User.logged.status(status)
+    watcher = User.watched_by(params[:user_id])
+    watcher.push(params[:user_id])
+    search_by = params[:search_by] ? params[:search_by] : "0"
+    scope = scope.where("id not in (?)",watcher).like(params[:name],search_by) if params[:name].present?
     scope
   end