From e2d75ec2c6d27a1e0604792942a3a7d7bef00880 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 11 Nov 2019 13:52:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E5=B9=BF=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AutoPackController.class.php | 14 ++++---------- .../Home/Controller/PromoteController.class.php | 5 ++--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 49738d9ca..fc3c4d04f 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -294,17 +294,11 @@ class AutoPackController extends Think * 渠道游戏打包 */ private function channel() { - $zip = new \ZipArchive(); - + $map = []; $map['status'] = 1; $map['enable_status'] = ['in', '0,2,3']; - - $applyModel = M('apply', 'tab_'); - $gameSourceModel = M('Game_source', 'tab_'); - $launchModel = M('apply_launch', 'tab_'); - - $applys = $applyModel - ->field('id,game_id,game_name,promote_id,promote_account,sdk_version') + + $applys = M('apply', 'tab_')->field('id,game_id,game_name,promote_id,promote_account,sdk_version') ->where($map) ->order('bale_sort desc,id desc') ->limit(200) @@ -319,7 +313,7 @@ class AutoPackController extends Think $games = M('game', 'tab_')->field(['id', 'game_appid', 'game_name', 'icon', 'sdk_version'])->where(['id' => ['in', $gameIds]])->select(); $games = index_by_column('id', $games); - $launchCountList = $launchModel->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select(); + $launchCountList = M('apply_launch', 'tab_')->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select(); $launchCountList = index_by_column('apply_id', $launchCountList); $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id'])->where(['game_id' => ['in', $gameIds]])->select(); diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 940b21e5e..5f50d1d8a 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -37,9 +37,8 @@ class PromoteController extends BaseController { $this->meta_title = "首页"; $loginPromote = $this->getLoginPromote(); - - $whiteList = [1, 8, 84]; - $isOpenQuery = in_array($loginPromote['id'], $whiteList) || in_array($loginPromote['parent_id'], $whiteList) || in_array($loginPromote['grand_id'], $whiteList) ? true : false; + + $isOpenQuery = true; if (!$isOpenQuery) { $this->display('prepare');