Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/queries/admins/school_query.rb

@@ -13,11 +13,15 @@ class Admins::SchoolQuery < ApplicationQuery
     schools = School.all
 
     keyword = strip_param(:keyword)
-    schools = schools.where('schools.name LIKE ?', "%#{keyword}%") if keyword
-
-    schools = schools.joins(:user_extensions).group(:id)
+    Rails.logger.info("###########{keyword}")
+    if keyword
+      schools = schools.where('schools.name LIKE ?', "%#{keyword}%")
+    end
+    Rails.logger.info("#########school_name: ##{schools.first.name}")
+    Rails.logger.info("#########school_id: ##{schools.first.id}")
+    schools = schools.joins(:user_extensions).group("schools.id")
+    Rails.logger.info("#########school_id: ##{schools.first.id}")
     schools = schools.select('schools.*, COUNT(*) AS users_count')
-
     custom_sort schools, params[:sort_by], params[:sort_direction]
   end
 end