From 21c48ea3831713f8af49afebc499cc75a0a5d19a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 24 Aug 2016 17:46:18 +0800
Subject: [PATCH] =?UTF-8?q?at=E6=89=80=E6=9C=89=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/at_controller.rb |  2 +-
 app/views/at/show.json.erb       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/at_controller.rb b/app/controllers/at_controller.rb
index 0e48cd962..66cbf27b8 100644
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@@ -10,7 +10,7 @@ class AtController < ApplicationController
     @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }.sort{|x,y| to_pinyin(x.show_name) <=> to_pinyin(y.show_name)} if users
 
     #加上all
-    if @user && @users.size > 0
+    if User.current.logged? && @users.size > 0
       allUser = Struct.new(:id, :name).new
       allUser.id = @users.map{|u| u.id}.join(",")
       allUser.name = "all"
diff --git a/app/views/at/show.json.erb b/app/views/at/show.json.erb
index 767c23835..3e49496f9 100644
--- a/app/views/at/show.json.erb
+++ b/app/views/at/show.json.erb
@@ -1,11 +1,11 @@
 [
-  <% @users && @users.each_with_index do |person,index| %>
-  <% if index == 0 %>
-  {"id":<%=index%>, "userid": "<%=person.id%>", "name": "所有人", "login": "", "searchKey": ""}
-  <%= index != @users.size-1 ? ',' : '' %>
-  <% else %>
-  {"id":<%=index%>, "userid": "<%=person.id%>", "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
-  <%= index != @users.size-1 ? ',' : '' %>
-  <% end %>
-  <% end %>
+    <% @users && @users.each_with_index do |person,index| %>
+    <% if index == 0 %>
+    {"id":<%=index%>, "userid": "<%=person.id%>", "name": "所有人", "login": "<%=person.name%>", "searchKey": "<%=person.name%>"}
+    <%= index != @users.size-1 ? ',' : '' %>
+    <% else %>
+    {"id":<%=index%>, "userid": "<%=person.id%>", "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
+    <%= index != @users.size-1 ? ',' : '' %>
+    <% end %>
+    <% end %>
 ]