From c647789ca813e2ea8aa7bbd22ee7adc6525f956f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 10 Mar 2020 02:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E6=98=9F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                   | 2 +-
 app/views/shixuns/_top.json.jbuilder | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 7e60983d1..b0bd191d2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -339,7 +339,7 @@ class User < ApplicationRecord
   # 实训管理员：实训合作者、admin
   def manager_of_shixun?(shixun)
     logger.info("############id: #{id}")
-     shixun.shixun_members.exists?(role: [1,2], user_id: id) || admin? || business?
+     shixun.shixun_members.exists?(user_id: id, role: [1,2]) || admin? || business?
   end
 
   # 实训管理员
diff --git a/app/views/shixuns/_top.json.jbuilder b/app/views/shixuns/_top.json.jbuilder
index 362cfd15b..c90de5e5b 100644
--- a/app/views/shixuns/_top.json.jbuilder
+++ b/app/views/shixuns/_top.json.jbuilder
@@ -14,7 +14,7 @@ json.name           shixun.name
 json.stu_num        shixun.myshixuns_count
 json.experience     shixun.all_score
 json.diffcult       level_to_s(shixun.trainee)
-json.score_info     shixun.shixun_preference_info # todo: 这块可以改成只显示实训的平均分，不用每次都去取每种星的分数了。
+json.score_info     shixun.averge_star # todo: 这块可以改成只显示实训的平均分，不用每次都去取每种星的分数了。
 json.is_jupyter     shixun.is_jupyter
 # 用于是否显示导航栏中的'背景知识'
 json.propaedeutics  shixun.propaedeutics.present?