elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
yulingwei 5 years ago
parent 2ab47c0864 ccfcd2c7a3
commit 7c3a3bc0c6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/PromoteController.class.php
Unescape Escape View File

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

2
Application/Home/Controller/DownloadController.class.php
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save