Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/queries/weapps/subject_query.rb

@@ -21,7 +21,7 @@ class Weapps::SubjectQuery < ApplicationQuery
 
     subjects = subjects.left_joins(:shixuns).select('subjects.id, subjects.name, subjects.excellent, subjects.stages_count, subjects.status, subjects.homepage_show,
                                                      subjects.shixuns_count, subjects.updated_at, IFNULL(sum(shixuns.myshixuns_count), 0) myshixuns_count')
-                                            .group('subjects.id').order("(homepage_show, #{order_type}) #{sort_type}")
+                                            .group('subjects.id').order("(homepage_show #{sort_type}, #{order_type} #{sort_type})")
     subjects
   end