From a85c217c6bca79b583712655e0baac3e3e191e26 Mon Sep 17 00:00:00 2001
From: xxxx <2222@qq.com>
Date: Mon, 3 Feb 2020 14:51:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?OA=E7=AE=A1=E7=90=86=E5=91=98=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PromoteController.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 223d6d0fc..6ac74ba0f 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -111,6 +111,7 @@ class PromoteController extends ThinkController
             $map['oa_associated'] = I('oa_associated');
             $oa_data = [];
             for ($i = 1; $i > 0; $i++) {
+                $arr = [];
                 $arr['time'] = time();
                 $arr['page'] = $i;
                 $arr['pageSize'] = 1000;
@@ -120,7 +121,7 @@ class PromoteController extends ThinkController
                 $arr['sign'] = $sign;
                 $re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/platformAccount', $arr);
                 $re_data = json_decode($re_data, true);
-                if ($re_data['code'] == 1) {
+                if (!empty($re_data['data'])) {
                     $oa = $re_data['data'];
                     $oa_data = array_merge($oa_data, $oa);
                 } else {

From b5a2ddba3c0c6c8ff182b8c7f08bb0f4b8a09d96 Mon Sep 17 00:00:00 2001
From: liuweiwen <529520975@qq.com>
Date: Tue, 4 Feb 2020 19:35:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=97=B60?=
 =?UTF-8?q?=E7=82=B9=E5=B1=9E=E4=BA=8E=E5=BD=93=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php  | 2 +-
 Application/Admin/Controller/FinanceController.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 118624446..d61e779d8 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -7203,7 +7203,7 @@ class ExportController extends Controller
 
         if (!empty(I('timestart'))) {
             $timestart = strtotime(I('timestart'));
-            $map['_string'] = "pay_time > {$timestart}";
+            $map['_string'] = "pay_time >= {$timestart}";
         }
 
         if (!empty(I('timeend'))) {
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index f3a6da5fb..78788ca45 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -778,7 +778,7 @@ class FinanceController extends ThinkController
 
         if (!empty(I('timestart'))) {
             $timestart = strtotime(I('timestart'));
-            $map['_string'] = "pay_time > {$timestart}";
+            $map['_string'] = "pay_time >= {$timestart}";
         }
 
         if (!empty(I('timeend'))) {