From 1c4dcbd5f8d994ff22a08ff8e5c4fd5083a0b0a0 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Wed, 28 Feb 2018 20:43:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E7=AB=99=E5=AE=9A=E5=88=B6=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A7=81=E6=9C=89=E4=B9=A6=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/db.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/database/db.js b/database/db.js index 78f3d84..6f7846c 100644 --- a/database/db.js +++ b/database/db.js @@ -630,12 +630,12 @@ db.getBookmarksCostomTag = function(user_id, perPageItems) { db.getBookmarksCostomAllUsersTag = function(user_id, perPageItems) { console.log('getBookmarksCostomAllUsersTag', user_id, perPageItems); perPageItems = perPageItems || 50; - var sql1 = "(SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE `user_id` != '" + user_id + "' ORDER BY `click_count` DESC LIMIT 0, " + perPageItems + ")"; - var sql2 = "(SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE `user_id` != '" + user_id + "' ORDER BY `created_at` DESC LIMIT 0, " + perPageItems + ")"; - var sql3 = "(SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE `user_id` != '" + user_id + "' ORDER BY `last_click` DESC LIMIT 0, " + perPageItems + ")"; + var sql1 = "(SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE `user_id` != '" + user_id + "' AND public != 0 ORDER BY `click_count` DESC LIMIT 0, " + perPageItems + ")"; + var sql2 = "(SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE `user_id` != '" + user_id + "' AND public != 0 ORDER BY `created_at` DESC LIMIT 0, " + perPageItems + ")"; + var sql3 = "(SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE `user_id` != '" + user_id + "' AND public != 0 ORDER BY `last_click` DESC LIMIT 0, " + perPageItems + ")"; var sql = sql1 + " UNION " + sql2 + " UNION " + sql3; - console.log(sql); + // console.log(sql); return new Promise(function(resolve, reject) { client.query(sql, (err, result) => { if (err) {