From 4c8e1917ab65fcea0b6f82a30b57594a9bf27b73 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 13 Nov 2019 13:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/colleges_controller.rb |  2 +-
 app/views/colleges/statistics.html.erb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb
index cc4e6c9a..93d2df8e 100644
--- a/app/controllers/colleges_controller.rb
+++ b/app/controllers/colleges_controller.rb
@@ -258,7 +258,7 @@ class CollegesController < ApplicationController
     unless (User.current.admin? || User.current.business? ||
         (@department.present? && DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present?) ||
         (User.current.user_extensions.try(:school_id) == @school.id && User.current.user_extensions.try(:identity) == 0) ||
-        (@school.try(:customer_id) && User.current.try(:partner).try(:customer_ids) &&  User.current.try(:partner).try(:customer_ids).include?(@school.try(:customer_id))))
+        (@school.try(:customer_id) && User.current.try(:partner).try(:customer_ids) && User.current.try(:partner).try(:customer_ids).include?(@school.try(:customer_id))))
       render_403
     end
   end
diff --git a/app/views/colleges/statistics.html.erb b/app/views/colleges/statistics.html.erb
index 8df81fcb..cc7ff4e6 100644
--- a/app/views/colleges/statistics.html.erb
+++ b/app/views/colleges/statistics.html.erb
@@ -139,15 +139,15 @@
             })
         });
 
-        $.get('<%= shixun_time_college_path(@school) %>', function(data){
+        $.get('<%= shixun_time_college_path(@department.identifier) %>', function(data){
           $('.shixun-time').html("<span data-tip-down=\"所有学员的实训耗时之和\">" + data.shixun_time + "</span>天");
         });
-        $.get('<%= shixun_report_count_college_path(@school) %>', function(data){
+        $.get('<%= shixun_report_count_college_path(@department.identifier) %>', function(data){
           $('.shixun-report-count').html("<span>" + data.shixun_report_count + "</span>个");
         });
 
         // 教师排名
-        $.ajax({ url: '<%= teachers_college_path(@school) %>', method: 'GET', dataType: 'script' })
+        $.ajax({ url: '<%= teachers_college_path(@department.identifier) %>', method: 'GET', dataType: 'script' })
 
         $(".count_student_test a").click(function(){
             $(".count_student_test a").removeClass("active");
@@ -155,7 +155,7 @@
         });
 
         //初始化饼状图
-        $.get('<%= shixun_chart_data_college_path(@school) %>', function(data){
+        $.get('<%= shixun_chart_data_college_path(@department.identifier) %>', function(data){
           $('.pie-chart-loading').hide();
           if (data.names.length > 0) {
             $('.online_status .edu-tab-con-box').hide();
@@ -166,7 +166,7 @@
           }
         });
 
-        $.get('<%= course_statistics_college_path(@school) %>');
+        $.get('<%= course_statistics_college_path(@department.identifier) %>');
     });
     function InitPieChart(names, data){
         var Color = ['#49A9EE', '#FFD86E', '#98D87D', '#8996E6', '#F3857B', '#B97BF3','#4DE8B4','#F37BDB','#566EFF','#FF961A'];