From 762fdfe634db4914e6256c1303a686d526695065 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 5 Aug 2016 20:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb    | 12 ++++++++++++
 app/api/mobile/entities/course.rb |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 575048211..369185ca2 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -167,8 +167,20 @@ module Mobile
           requires :course_id, type: Integer, desc: "课程id"
         end
         get 'teachers' do
+
+          course = Course.find(params[:course_id])
+
           cs = CoursesService.new
           teachers = cs.course_teacher_or_student_list({role: '1'}, params[:course_id],current_user)
+
+          teachers.each do |m|
+            if m[:id] == course.tea_id
+              teachers.delete(m)
+              teachers.insert(0,m)
+              break
+            end
+          end
+
           present :data, teachers, with: Mobile::Entities::User
           present :status, 0
         end
diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index aaf5dd78b..925c4d7a7 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -65,9 +65,9 @@ module Mobile
         end
 
         member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
-        roleName = member.roles[0].name if member
+        role_ids = member.role_ids if member
 
-        if roleName && (roleName == "TeachingAsistant" || roleName == "Teacher" )
+        if role_ids && (role_ids.include?(7) || role_ids.include?(9) )
           can_setting = true
         end