liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新一下sql语句

This commit is contained in:
luchenqun 2017-02-26 22:33:40 +08:00
parent eb4ad76333
commit 7fa119a4b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
database/db.js
View File

@ -520,9 +520,9 @@ db.getBookmarksTable = function(params) {
if (user_id) { if (user_id) {
sql += " AND `user_id` = '" + user_id + "'"; sql += " AND `user_id` = '" + user_id + "'";
if (params.showStyle == 'card') { if (params.showStyle == 'card') {
sql += " ORDER BY bookmarks.created_at DESC"; sql += " ORDER BY bookmarks.created_at DESC, bookmarks.click_count DESC";
} else { } else {
sql += " ORDER BY click_count DESC"; sql += " ORDER BY bookmarks.click_count DESC, bookmarks.created_at DESC";
} }
} }
console.log(sql); console.log(sql);
@ -555,7 +555,7 @@ db.getBookmarksByTag = function(params) {
params.currentPage = params.currentPage || 1; params.currentPage = params.currentPage || 1;
params.perPageItems = params.perPageItems || 20; 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) { return new Promise(function(resolve, reject) {
client.query(sql, (err, result) => { client.query(sql, (err, result) => {