From 7d265739828b1d6a9e691802058c6de6d6e1acc6 Mon Sep 17 00:00:00 2001
From: chaosBreaking <x491807573@qq.com>
Date: Wed, 9 Oct 2019 09:04:48 +0800
Subject: [PATCH] admin

---
 src/modules/admin/admin.controller.js | 10 +++++-----
 src/modules/admin/admin.service.js    |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/modules/admin/admin.controller.js b/src/modules/admin/admin.controller.js
index 58857c6..e123a95 100644
--- a/src/modules/admin/admin.controller.js
+++ b/src/modules/admin/admin.controller.js
@@ -59,7 +59,7 @@ module.exports = {
     async getUserActions (req, res) {
         const { adminId } = res.locals.user;
         if (!adminId) return res.json({ code: 1, msg: '非法访问' });
-        const { pageSize = 10, pageIndex = 1} = req.body.option;
+        const { pageSize = 10, pageIndex = 1} = req.body.option || {};
         await Action.find({ ...req.body.query }).limit(+pageSize).skip((+pageIndex - 1) * +pageSize).then(data => {
             return res.json({
                 code: 0,
@@ -75,7 +75,7 @@ module.exports = {
     async getDepositTicket (req, res) {
         const { adminId } = res.locals.user;
         if (!adminId) return res.json({ code: 1, msg: '非法访问' });
-        const { pageSize = 10, pageIndex = 1} = req.body.option;
+        const { pageSize = 10, pageIndex = 1} = req.body.option || {};
         await Ticket.find({ ...req.body.query }).limit(+pageSize).skip((+pageIndex - 1) * +pageSize).then(data => {
             return res.json({
                 code: 0,
@@ -91,8 +91,8 @@ module.exports = {
     async getUsers (req, res) {
         const { adminId } = res.locals.user;
         if (!adminId) return res.json({ code: 1, msg: '非法访问' });
-        const { pageSize = 10, pageIndex = 1} = req.body.option;
-        const [sum, data] = await Promise.all([User.count({}), User.find({ ...req.body.data }).limit(+pageSize).skip((+pageIndex - 1) * pageSize)])
+        const { pageSize = 10, pageIndex = 1} = req.body.option || {};
+        const [sum, data] = await Promise.all([User.count({}), User.find({ ...req.body.query }, 'id nickname phone group inviter createdAt').limit(+pageSize).skip((+pageIndex - 1) * pageSize)])
         .catch(err => {
             return [err.msg, ''];
         });
@@ -109,7 +109,7 @@ module.exports = {
     async getFunds (req, res) {
         const { adminId } = res.locals.user;
         if (!adminId) return res.json({ code: 1, msg: '非法访问' });
-        const { pageSize = 10, pageIndex = 1} = req.body.option;
+        const { pageSize = 10, pageIndex = 1} = req.body.option || {};
         await Fund.find({ ...req.body.query }).limit(+pageSize).skip((+pageIndex - 1) * +pageSize).then(data => {
             return res.json({
                 code: 0,
diff --git a/src/modules/admin/admin.service.js b/src/modules/admin/admin.service.js
index c15feb8..283b905 100644
--- a/src/modules/admin/admin.service.js
+++ b/src/modules/admin/admin.service.js
@@ -23,6 +23,11 @@ const services = [
 		method: 'POST',
 		controller: controller.getUsers
 	},
+	{
+		url: '/funds',
+		method: 'POST',
+		controller: controller.getFunds
+	},
 	
 ];