From 532b315846503dd457f3981c4414c5df376736c4 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@juzix.io>
Date: Fri, 11 May 2018 14:59:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E5=BF=98=E6=90=9C=E7=B4=A2=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E8=BF=87=E6=BB=A4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/db.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/database/db.js b/database/db.js
index 66d04f4..0352acc 100644
--- a/database/db.js
+++ b/database/db.js
@@ -1095,6 +1095,12 @@ db.addNote = function(note) {
 db.getNotes = function(params) {
     var sql = "SELECT notes.id, notes.content, notes.tag_id, DATE_FORMAT(notes.created_at, '%Y-%m-%d %H:%i:%s') as created_at, tags.name as tagName FROM `notes` LEFT JOIN tags ON  tags.id = notes.tag_id  WHERE notes.user_id = '" + params.user_id + "'";
 
+    if (params.dateCreate) {
+        var d = new Date();
+        d.setDate(d.getDate() - parseInt(params.dateCreate));
+        sql += " AND notes.created_at >= '" + d.format("yyyyMMdd") + "'"
+    }
+
     if (params.searchWord) {
         sql += " AND notes.content LIKE '%" + params.searchWord + "%'";
     }
@@ -1103,6 +1109,10 @@ db.getNotes = function(params) {
         sql += " AND notes.tag_id  = '" + params.tagId + "'";
     }
 
+    if (params.tagIds) {
+        sql += "AND notes.tag_id IN (" + params.tagIds.toString() + ")"
+    }
+
     sql += " ORDER BY `created_at` DESC"
     console.log(sql);
     return new Promise(function(resolve, reject) {