|
|
|
@ -245,10 +245,10 @@ class UsersService
|
|
|
|
|
"show_changesets" => true
|
|
|
|
|
}
|
|
|
|
|
scope = User.logged.status(status)
|
|
|
|
|
search_by = params[:search_by] ? params[:search_by] : "0"
|
|
|
|
|
if params[:is_search_assitant].nil?
|
|
|
|
|
#modify by yutao 2015/5/18 没有params[:user_id]参数时去掉"id not in (?)"条件(bug:#2270) start
|
|
|
|
|
#say by yutao: params[:user_id]这个是指谁发起的搜索么? 如果是 这个值貌似应该从session获取 怪怪的赶脚-_-!
|
|
|
|
|
search_by = params[:search_by] ? params[:search_by] : "0"
|
|
|
|
|
if params[:name].present?
|
|
|
|
|
if !params[:user_id].nil?
|
|
|
|
|
watcher = User.watched_by(params[:user_id])
|
|
|
|
|