From 7eb1f03034a6bb8c7412e2478da2d1b3dc2c687c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 20 Mar 2020 17:57:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb        |  2 +-
 app/controllers/weapps/subjects_controller.rb |  2 +-
 app/queries/weapps/subject_query.rb           | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index c5cae99c4..b6fdf8ea9 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -17,7 +17,7 @@ class SubjectsController < ApplicationController
   include CustomSortable
 
   def index
-    subjects = Weapps::SubjectQuery.call(current_laboratory, params)
+    subjects = Weapps::SubjectQuery.call(current_laboratory, params, "web")
     @subject_count = subjects.map(&:id).size
     @subjects = paginate subjects.includes(:shixuns, :repertoire)
   end
diff --git a/app/controllers/weapps/subjects_controller.rb b/app/controllers/weapps/subjects_controller.rb
index e5c3eb316..e1e50cc40 100644
--- a/app/controllers/weapps/subjects_controller.rb
+++ b/app/controllers/weapps/subjects_controller.rb
@@ -4,7 +4,7 @@ class Weapps::SubjectsController < Weapps::BaseController
 
   # 首页
   def index
-    subjects = Weapps::SubjectQuery.call(current_laboratory, params)
+    subjects = Weapps::SubjectQuery.call(current_laboratory, params, "wechat")
     @subject_count = subjects.map(&:id).size
     @subjects = paginate subjects
   end
diff --git a/app/queries/weapps/subject_query.rb b/app/queries/weapps/subject_query.rb
index 180176ce2..c0fbbf653 100644
--- a/app/queries/weapps/subject_query.rb
+++ b/app/queries/weapps/subject_query.rb
@@ -2,13 +2,20 @@ class Weapps::SubjectQuery < ApplicationQuery
   include CustomSortable
   attr_reader :params
 
-  def initialize(current_laboratory, params)
+  def initialize(current_laboratory, params, device)
     @current_laboratory = current_laboratory
     @params = params
+    @device = device
   end
 
   def call
-    subjects = @current_laboratory.subjects.unhidden.publiced.show_moblied
+    Rails.logger.info("##### @device: #{@device}")
+    subjects =
+        if @device == "wechat"
+          @current_laboratory.subjects.unhidden.publiced
+        else
+          @current_laboratory.subjects.unhidden.publiced.show_moblied
+        end
 
     # 课程体系的过滤
     if params[:sub_discipline_id].present?

From 6936f05778f712eef6674f64008f3b07682e304f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 20 Mar 2020 18:00:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=92=8Cweb=E7=AB=AF?=
 =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/queries/weapps/subject_query.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/queries/weapps/subject_query.rb b/app/queries/weapps/subject_query.rb
index c0fbbf653..ca0c437a9 100644
--- a/app/queries/weapps/subject_query.rb
+++ b/app/queries/weapps/subject_query.rb
@@ -12,9 +12,9 @@ class Weapps::SubjectQuery < ApplicationQuery
     Rails.logger.info("##### @device: #{@device}")
     subjects =
         if @device == "wechat"
-          @current_laboratory.subjects.unhidden.publiced
-        else
           @current_laboratory.subjects.unhidden.publiced.show_moblied
+        else
+          @current_laboratory.subjects.unhidden.publiced
         end
 
     # 课程体系的过滤