From ade02eb9082e4822e7ee6222455abf20b298d353 Mon Sep 17 00:00:00 2001
From: chaosBreaking <x491807573@qq.com>
Date: Tue, 8 Oct 2019 16:32:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/admin/admin.controller.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/admin/admin.controller.js b/src/modules/admin/admin.controller.js
index ea4f936..58857c6 100644
--- a/src/modules/admin/admin.controller.js
+++ b/src/modules/admin/admin.controller.js
@@ -59,8 +59,8 @@ 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.headers;
-        await Action.find({ ...req.body }).limit(pageSize).skip((pageIndex - 1) * pageSize).then(data => {
+        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,
                 data
@@ -75,8 +75,8 @@ 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.headers;
-        await Ticket.find({ ...req.body }).limit(pageSize).skip((pageIndex - 1) * pageSize).then(data => {
+        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,
                 data
@@ -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.headers;
-        const [sum, data] = await Promise.all([User.count({}), User.find({ ...req.body }).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.data }).limit(+pageSize).skip((+pageIndex - 1) * pageSize)])
         .catch(err => {
             return [err.msg, ''];
         });
@@ -109,8 +109,8 @@ 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.headers;
-        await Fund.find({ ...req.body }).limit(pageSize).skip((pageIndex - 1) * pageSize).then(data => {
+        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,
                 data