From 4e56f9e325d57c2702f59360389ef62ef33f5ea4 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Wed, 27 Nov 2019 14:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SpendController.class.php   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index 945cc790f..f7de26932 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -93,13 +93,15 @@ class SpendController extends ThinkController
             $order = ' pay_time desc ';
         }
         
-        if (intval(($endTime + 1) - $startTime) / (24 * 3600) <= 31) {
-            $map1 = $map;
-            $map1['pay_status'] = 1;
-        } else {
-            $map = '1 = 2';
-            $map1 = $map;
-        }
+        // if (intval(($endTime + 1) - $startTime) / (24 * 3600) <= 31) {
+        //     $map1 = $map;
+        //     $map1['pay_status'] = 1;
+        // } else {
+        //     $map = '1 = 2';
+        //     $map1 = $map;
+        // }
+        $map1 = $map;
+        $map1['pay_status'] = 1;
         $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));
         $ttotal = null_to_0(D(self::model_name)->where('pay_time' . total(1))->where(array('pay_status' => 1))->sum('pay_amount'));
         $ytotal = null_to_0(D(self::model_name)->where('pay_time' . total(5))->where(array('pay_status' => 1))->sum('pay_amount'));