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

app/services/users/shixun_service.rb

@@ -44,7 +44,7 @@ class Users::ShixunService
   def user_policy_filter(relations)
     # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能
     if self_or_admin?
-      relations = relations.where.not(status: -1)
+      relations = relations.where.not(status: -1).where(hidden: false)
       status_filter(relations)
     else
       relations.where(status: [2, 3], hidden: false)

app/services/users/subject_service.rb

@@ -35,7 +35,7 @@ class Users::SubjectService
   def user_policy_filter(relations)
     # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能
     if self_or_admin?
-      status_filter(relations)
+      status_filter(relations.unhidden)
     else
       relations.where(status: 2, hidden: false)
     end