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

app/controllers/ec_course_supports_controller.rb

@@ -221,7 +221,7 @@ class EcCourseSupportsController < ApplicationController
 
   # 职业认证的权限判断
   def ec_auth
-    unless User.current.admin? || (User.current.ec_school.present? && @year.ec_major_school.pluck(:school_id).include?(User.current.ec_school))
+    unless User.current.admin? || (User.current.ec_school.present? && @year.ec_major_school.school_id == User.current.ec_school)
       render_403
     end
   end

app/views/ec_major_schools/_year_list.html.erb

@@ -53,9 +53,9 @@
             <a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>','您确定要删除吗?')" class="mr15 color-grey-c">删除</a>
           <% end %>
           <%#= link_to '删除', ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school), method: :delete, :class => "mr15 color-grey-c", data: { confirm: '您确定要删除吗' } %>
-          <% if @major_manager || @major_school.template_major %>
+          <%# if @major_manager || @major_school.template_major %>
-            <a href="javascript:void(0)" data-tip-down="导出本学年所有数据" class="mr15 color-blue">导出</a>
+            <!--<a href="javascript:void(0)" data-tip-down="导出本学年所有数据" class="mr15 color-blue">导出</a>-->
-          <% end %>
+          <%# end %>
           <%= link_to @btn_text, training_objectives_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>
                 </span>