From ac4f8dad02482c66c644d6a48d2f4195c1ddf91d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 25 Dec 2019 14:52:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index bda0df5dd..859dce6f6 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -363,7 +363,7 @@ class ShixunsController < ApplicationController
 		page  = params[:page]  || 1
 		limit = params[:limit] || 10
 		@member_count = @shixun.shixun_members.count
-		@members = @shixun.shixun_members.includes(:user).page(page).per(limit)
+		@members = @shixun.shixun_members.order("role = 1 desc, created_at asc").includes(:user).page(page).per(limit)
 	end
 
 	def fork_list