Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company

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'))) {

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'))) {

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 {