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

app/controllers/weapps/challenges_controller.rb

@@ -6,10 +6,10 @@ class Weapps::ChallengesController < Weapps::BaseController
     # 关卡有展示效果 || 选择题 || jupyter实训 || vnc || 隐藏代码窗口 || html+css实训
     # @challenge.show_type != -1 || @challenge.st == 1 || @shixun.is_jupyter? || @shixun.vnc ||
     #     @shixun.hide_code? || (@shixun.small_mirror_name & ["Css", "Html", "Web"]).present?
-    play =  @challenge.st == 1 || @shixun.is_jupyter? || @shixun.vnc ||
+    play = @shixun.is_jupyter? || @shixun.vnc ||
         @shixun.hide_code? || (@shixun.small_mirror_name & ["Css", "Html", "Web"]).present?
 
-    if play
+    if @challenge.st != 1 && play
       normal_status(-5, "该关卡暂不支持小程序")
     else
       render_ok

app/forms/users/update_account_form.rb

@@ -14,6 +14,7 @@ class Users::UpdateAccountForm
   validates :technical_title, presence: true, unless: -> { identity.to_s == 'student' }
   validates :student_id, presence: true, if: -> { identity.to_s == 'student' }
   validates :school_id, presence: true
+  validates :department_id, presence: true
 
   validate :check_school_exist
   def check_school_exist