From 4e56f2f62465ead26bb3c93877a5d106008c6975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=94=BE?= <lfang.li@qunar.com>
Date: Thu, 20 Jul 2017 11:19:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9model=20listCount?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/controllers/project.js      | 2 +-
 server/models/project.js           | 6 ++++--
 server_dist/controllers/project.js | 2 +-
 server_dist/models/project.js      | 6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/controllers/project.js b/server/controllers/project.js
index 69ee27c4..86a06bdf 100644
--- a/server/controllers/project.js
+++ b/server/controllers/project.js
@@ -227,7 +227,7 @@ class projectController extends baseController {
 
         try{
             let result = await this.Model.listWithPaging(group_id, page, limit);
-            let count = await this.Model.listCount();
+            let count = await this.Model.listCount(group_id);
             ctx.body = yapi.commons.resReturn({
                 total: Math.ceil(count / limit),
                 list: result
diff --git a/server/models/project.js b/server/models/project.js
index 84242700..1e55248b 100644
--- a/server/models/project.js
+++ b/server/models/project.js
@@ -74,8 +74,10 @@ class projectModel extends baseModel{
         }).skip((page - 1) * limit).limit(limit).exec();
     }
 
-    listCount() {
-        return this.model.count();
+    listCount(group_id) {
+        return this.model.count({
+            group_id: group_id
+        });
     }
 
     countByGroupId(group_id){
diff --git a/server_dist/controllers/project.js b/server_dist/controllers/project.js
index 3b9b1414..c2428b9e 100644
--- a/server_dist/controllers/project.js
+++ b/server_dist/controllers/project.js
@@ -602,7 +602,7 @@ var projectController = function (_baseController) {
                             case 6:
                                 result = _context6.sent;
                                 _context6.next = 9;
-                                return this.Model.listCount();
+                                return this.Model.listCount(group_id);
 
                             case 9:
                                 count = _context6.sent;
diff --git a/server_dist/models/project.js b/server_dist/models/project.js
index 6b1da8a3..e3126fa6 100644
--- a/server_dist/models/project.js
+++ b/server_dist/models/project.js
@@ -117,8 +117,10 @@ var projectModel = function (_baseModel) {
         }
     }, {
         key: 'listCount',
-        value: function listCount() {
-            return this.model.count();
+        value: function listCount(group_id) {
+            return this.model.count({
+                group_id: group_id
+            });
         }
     }, {
         key: 'countByGroupId',