From 7fa119a4b5fa62274c113722489d941d3bbf24ee Mon Sep 17 00:00:00 2001 From: luchenqun Date: Sun, 26 Feb 2017 22:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=8Bsql?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/db.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/db.js b/database/db.js index b3cca0a..ce434c2 100644 --- a/database/db.js +++ b/database/db.js @@ -520,9 +520,9 @@ db.getBookmarksTable = function(params) { if (user_id) { sql += " AND `user_id` = '" + user_id + "'"; if (params.showStyle == 'card') { - sql += " ORDER BY bookmarks.created_at DESC"; + sql += " ORDER BY bookmarks.created_at DESC, bookmarks.click_count DESC"; } else { - sql += " ORDER BY click_count DESC"; + sql += " ORDER BY bookmarks.click_count DESC, bookmarks.created_at DESC"; } } console.log(sql); @@ -555,7 +555,7 @@ db.getBookmarksByTag = function(params) { params.currentPage = params.currentPage || 1; params.perPageItems = params.perPageItems || 20; - var sql = "SELECT bookmarks.id, bookmarks.user_id, bookmarks.title, bookmarks.description, bookmarks.url, bookmarks.public, bookmarks.click_count, DATE_FORMAT(bookmarks.created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(bookmarks.last_click, '%Y-%m-%d') as last_click FROM `tags_bookmarks`, `bookmarks` WHERE tags_bookmarks.tag_id = '" + tag_id + "' AND tags_bookmarks.bookmark_id = bookmarks.id ORDER BY bookmarks.click_count DESC"; + var sql = "SELECT bookmarks.id, bookmarks.user_id, bookmarks.title, bookmarks.description, bookmarks.url, bookmarks.public, bookmarks.click_count, DATE_FORMAT(bookmarks.created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(bookmarks.last_click, '%Y-%m-%d') as last_click FROM `tags_bookmarks`, `bookmarks` WHERE tags_bookmarks.tag_id = '" + tag_id + "' AND tags_bookmarks.bookmark_id = bookmarks.id ORDER BY bookmarks.click_count DESC, bookmarks.created_at DESC"; return new Promise(function(resolve, reject) { client.query(sql, (err, result) => {