Merge branch 'dev_aliyun' into develop

app/controllers/application_controller.rb

@@ -23,7 +23,7 @@ class ApplicationController < ActionController::Base
 
 	# 所有请求必须合法签名
 	def check_sign
-		if !Rails.env.development? ||
+		if !Rails.env.development?
 			Rails.logger.info("66666  #{params}")
 			# suffix = request.url.split(".").last.split("?").first
 			# suffix_arr = ["xls", "xlsx", "pdf", "zip"] # excel文件先注释

app/controllers/subjects_controller.rb

@@ -200,7 +200,7 @@ class SubjectsController < ApplicationController
   end
 
   def append_to_stage
-    @shixuns = Shixun.where(id: params[:shixun_id]).order("id desc")
+    @shixuns = Shixun.where(id: params[:shixun_id]).order("field(id, #{params[:shixun_id]})")
   end
 
   # 添加实训项目

app/services/shixun_search_service.rb

@@ -26,7 +26,7 @@ class ShixunSearchService < ApplicationService
         shixun_ids = ShixunSchool.where(school_id: User.current.school_id).pluck(:shixun_id)
         shixun_ids = shixun_ids.reject(&:blank?).length == 0 ? -1 : shixun_ids.join(",")
 
-        @shixuns = @shixuns.where("use_scope = 0 or id in (#{shixun_ids})").unhidden.published.or(@shixuns.where(id: User.current.shixuns))
+        @shixuns = @shixuns.where("use_scope = 0 or id in (#{shixun_ids})").unhidden.publiced.or(@shixuns.where(id: User.current.shixuns))
       end
     end