From 9bc8453ba3b14c11cc2956d7658d6e08efa7e68b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 28 Jun 2019 15:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb             | 2 +-
 app/views/shixuns/add_collaborators.json.jbuilder | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 32a2c6ef9..89a0d524f 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -635,7 +635,7 @@ class ShixunsController < ApplicationController
 		end
 		page = params[:page] || 1
 		limit = params[:limit] || 20
-		@users_count = @users.count
+		@total_count = @users.count
 		@users = @users.page(page).per(limit)
 
 	end
diff --git a/app/views/shixuns/add_collaborators.json.jbuilder b/app/views/shixuns/add_collaborators.json.jbuilder
index 7bac0c24c..963389933 100644
--- a/app/views/shixuns/add_collaborators.json.jbuilder
+++ b/app/views/shixuns/add_collaborators.json.jbuilder
@@ -1,5 +1,5 @@
 #json.partial! "users/users_list", users: @users
-#json.users_count @users_count
+json.total_count @total_count
 json.array! @users do |user|
   json.user_id user.id
   json.identify user.identity