Merge branches 'dev_aliyun' and 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter

app/controllers/student_works_controller.rb

@@ -529,7 +529,7 @@ class StudentWorksController < ApplicationController
     @echart_data = student_efficiency(@homework, @work)
     @myself_eff = @echart_data[:efficiency_list].find { |item| item.last == @user.id }
     @myself_consume = @echart_data[:consume_list].find { |item| item.last == @user.id }
-    filename_ = "#{@use&.student_id}_#{@use&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
+    filename_ = "#{@user&.student_id}_#{@user&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
     filename = filename_.strip.tr("+/", "-_")
     stylesheets = %w(shixun_work/shixun_work.css shared/codemirror.css)
     if params[:export].present? && params[:export]

app/services/shixun_search_service.rb

@@ -38,6 +38,7 @@ class ShixunSearchService < ApplicationService
       @shixuns = @shixuns.where(trainee: params[:diff])
     end
 
+    Rails.logger.info("search_shixun_ids: #{@shixuns.pluck(:id)}")
     Shixun.search(keyword, search_options)
   end