Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/PromoteController.class.php

@@ -103,6 +103,7 @@ unset($_REQUEST['parent_id']);
             $promote =  D(self::model_name)->field('id,account')->where(['oa_associated' => 0])->order('id DESC')->select();
             $oa_data = array_column($oa_data, 'platform_account');
             foreach($promote as $k => $v) {
+                $v['account'] = trim($v['account']);
                 if(in_array($v['account'], $oa_data)) {
                     M('promote','tab_')->where(['id' => $v['id']])->setField(['oa_associated' => 1]);
                 }
@@ -114,8 +115,9 @@ unset($_REQUEST['parent_id']);
         if(I('oa_associated',-1) == -1) {
             foreach($list_data as $k => $v)
             {
+                $list_data[$k]['account'] = trim($v['account']);
                 if($v['oa_associated'] != 1) {
-                    $oa_data[] = $v['account'];
+                    $oa_data[] = $list_data[$k]['account'];
                 }
             }
             if(!empty($oa_data))

Application/Home/Controller/DownloadController.class.php

@@ -2450,7 +2450,7 @@ class DownloadController extends BaseController {
             flush();
         }
         fclose($fp);
-
+        $this->backSuccessExport($id);
     }
      
      public function withdrawRecordExcelInfo($id,$map) {