From 8236f80461736398a6cc5b13f7b02c899ecb86fd Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 13 Dec 2019 20:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=92=8C=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B7=B2=E9=9A=90=E8=97=8F=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users/shixun_service.rb  | 2 +-
 app/services/users/subject_service.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/users/shixun_service.rb b/app/services/users/shixun_service.rb
index ef399ce8c..279d147f4 100644
--- a/app/services/users/shixun_service.rb
+++ b/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)
diff --git a/app/services/users/subject_service.rb b/app/services/users/subject_service.rb
index 8a4fdce3b..53ff3f4b9 100644
--- a/app/services/users/subject_service.rb
+++ b/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