From 5d90a022b205cddfaa82e9de8d0efedcfc21a9a6 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Fri, 13 Apr 2018 20:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=86=E7=B1=BB=E4=B8=8B?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=A4=87=E5=BF=98=E5=BD=95=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/db.js | 5 ++--- public/views/note.html | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/database/db.js b/database/db.js index f258f8d..66d04f4 100644 --- a/database/db.js +++ b/database/db.js @@ -410,9 +410,8 @@ db.getUser = function(username) { }; db.getTags = function(user_id) { - console.log('getTags'); - var sql = "SELECT t.id, t.user_id, t.name, DATE_FORMAT(t.last_use, '%Y-%m-%d %H:%i:%s') as last_use, t.sort, tb.cnt FROM `tags` as t LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as cnt FROM tags_bookmarks GROUP BY tag_id ) tb ON t.id = tb.tag_id WHERE t.user_id = '" + user_id + "' ORDER BY t.sort, t.last_use DESC"; - + var sql = "SELECT t.id, t.user_id, t.name, DATE_FORMAT(t.last_use, '%Y-%m-%d %H:%i:%s') as last_use, t.sort, tb.cnt, tg.ncnt FROM `tags` as t LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as cnt FROM tags_bookmarks GROUP BY tag_id ) tb ON t.id = tb.tag_id LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as ncnt FROM notes GROUP BY tag_id ) tg ON t.id = tg.tag_id WHERE t.user_id = '" + user_id + "' ORDER BY t.sort, t.last_use DESC"; + console.log('getTags sql = ', sql); return new Promise(function(resolve, reject) { client.query(sql, (err, result) => { if (err) { diff --git a/public/views/note.html b/public/views/note.html index e713b16..cebfeed 100644 --- a/public/views/note.html +++ b/public/views/note.html @@ -1,5 +1,5 @@
-
{{ tag.name }}
+
{{ tag.name }} ({{ tag.ncnt || 0 }})