From 1287cf6d53bbc435be5bb1c301637a5fe7c11690 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 17 Jul 2019 18:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=9B=9E=E5=A4=8D=E7=89=B9?=
 =?UTF-8?q?=E5=88=AB=E6=85=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/discusses_service.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/services/discusses_service.rb b/app/services/discusses_service.rb
index a43ccfa8..cebdf426 100644
--- a/app/services/discusses_service.rb
+++ b/app/services/discusses_service.rb
@@ -30,14 +30,15 @@ class DiscussesService
     memo_count = memos.count
     memos = memos.offset(offset).limit(15)
     #实训标签使用最多的9个
-    hot_tags = TagRepertoire.find_by_sql("select a.name, sum(a.cnt) cnt, a.id from
-                                          (select tr.id, tr.name, count(d.dis_id) cnt, d.root_id, s.status, s.hidden
-                                          from tag_repertoires tr join (shixun_tag_repertoires str
-                                          left join (shixuns s join discusses d on d.dis_id = s.id and d.root_id is null and s.status =2 and s.hidden=false)
-                                          on s.id = str.shixun_id) on tr.id = str.tag_repertoire_id
-                                          group by d.dis_id order by cnt desc) a group by a.name
-                                          order by cnt desc limit 9").map{|ht| ht.attributes.dup}
-
+    # hot_tags = TagRepertoire.find_by_sql("select a.name, sum(a.cnt) cnt, a.id from
+    #                                       (select tr.id, tr.name, count(d.dis_id) cnt, d.root_id, s.status, s.hidden
+    #                                       from tag_repertoires tr join (shixun_tag_repertoires str
+    #                                       left join (shixuns s join discusses d on d.dis_id = s.id and d.root_id is null and s.status =2 and s.hidden=false)
+    #                                       on s.id = str.shixun_id) on tr.id = str.tag_repertoire_id
+    #                                       group by d.dis_id order by cnt desc) a group by a.name
+    #                                       order by cnt desc limit 9").map{|ht| ht.attributes.dup}
+    tag_id = ShixunTagRepertoire.joins(:shixun).order("myshixuns_count desc").pluck(:tag_repertoire_id).uniq.first(9)
+    hot_tags = TagRepertoire.select([:id, :name]).where(:id => tag_id).order("FIELD(id, #{tag_id.join(",")})") if tag_id
     memos = memo_list memos
     user_info = format_for_current_user current_user
     hot_memos = Memo.field_for_recommend.posts.hot.limit(4)