From a8e14c47554ab5dcd78790c909516218cf6c692d Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Mon, 16 Apr 2018 19:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=A4=87=E5=BF=98=E5=BD=95?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=BD=93=E5=89=8D=E9=A1=B5=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/note-controller.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/scripts/controllers/note-controller.js b/public/scripts/controllers/note-controller.js
index c812bd0..210069e 100644
--- a/public/scripts/controllers/note-controller.js
+++ b/public/scripts/controllers/note-controller.js
@@ -39,7 +39,6 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind
 
     $scope.changeCurrentPage = function (currentPage) {
         currentPage = parseInt(currentPage) || 0;
-        console.log('currentPage = ', currentPage);
         if (currentPage <= $scope.totalPages && currentPage >= 1) {
             $scope.currentPage = currentPage;
             $scope.inputPage = '';
@@ -262,6 +261,7 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind
         if ($scope.add || $scope.edit) {
 
         } else {
+            $scope.currentPage = 1;
             getNotes($scope.currentTagId);
         }
     }
@@ -317,8 +317,8 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind
             perPageItems: perPageItems,
             searchWord: $scope.searchWord,
         };
-        if (tagId) {
-            params.tagId = tagId;
+        if (tagId || $scope.currentTagId) {
+            params.tagId = tagId || $scope.currentTagId;
         }
         bookmarkService.getNotes(params)
             .then((data) => {