From 584bde247e5f9e07a2a17bf327697fa187b710ec Mon Sep 17 00:00:00 2001
From: lealife <lifephp@gmail.com>
Date: Sat, 31 Dec 2016 12:10:27 +0800
Subject: [PATCH] fix search deleted note

---
 app/service/NoteService.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/service/NoteService.go b/app/service/NoteService.go
index 6e8e449..157ad64 100644
--- a/app/service/NoteService.go
+++ b/app/service/NoteService.go
@@ -863,7 +863,13 @@ func (this *NoteService) searchNoteFromContent(notes []info.Note, userId, key st
 	notes2 := this.ListNotesByNoteIds(noteIds2)
 
 	// 合并之
-	notes = append(notes, notes2...)
+	// 不能是删除的
+	for _, n := range notes2 {
+		if !n.IsDeleted && !n.IsTrash {
+			// notes = append(notes, notes2...)
+			notes = append(notes, n)
+		}
+	}
 	return notes
 }