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

可以获取其他人分类

This commit is contained in:
luchenqun 2018-05-15 11:20:00 +08:00
parent f3d0f6356b
commit a8494f0949
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
database/db.js
View File

@ -410,7 +410,11 @@ db.getUser = function(username) {
};
db.getTags = function(user_id) {
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";
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 ";
if (user_id) {
sql += "WHERE t.user_id = '" + user_id + "' ";
}
sql += "ORDER BY t.sort, t.last_use DESC";
console.log('getTags sql = ', sql);
return new Promise(function(resolve, reject) {
client.query(sql, (err, result) => {

4
routes/api.js
View File

@ -516,6 +516,8 @@ api.get('/bookmarksByTag', function(req, res) {
bookmarks: [],
}
// -1 获取自己定制的
// -2 获取全站定制的
var fun = (params.tagId <= -1) ? (params.tagId == -1 ? db.getBookmarksCostomTag : db.getBookmarksCostomAllUsersTag) : (db.getBookmarksByTag);
fun((params.tagId <= -1) ? (userId) : (params), params.perPageItems)
@ -526,7 +528,7 @@ api.get('/bookmarksByTag', function(req, res) {
})
.then((tbs) => {
tagsBookmarks = tbs;
return db.getTags(userId);
return db.getTags(params.tagId >= -1 ? userId : null);
})
.then((tags) => {
// 获取每个书签的所有分类标签