Merge branch 'hotfix/promote_game_bug' of wmtx/platform into release

修改游戏列表bug

Application/Home/Controller/GameController.class.php

@@ -81,6 +81,9 @@ class GameController extends BaseController
             $conditions['offline_status'] = 0;
         }
 
+        if (count($gameIds) == 0) {
+            $gameIds = [0];
+        }
         $conditions['server_type'] = $serverType;
         $conditions['id'] = ['in', $gameIds];
         $conditions['game_status'] = 1;
@@ -285,10 +288,10 @@ class GameController extends BaseController
         $promoteService = new PromoteService();
         $gameIds = $promoteService->getVisibleGameIds($loginPromote);
         $conditions = [];
-        if ($gameIds !== true) {
+        if ($gameIds && count($gameIds) > 0) {
             $conditions = ['_logic' => 'or', 'android_game_id' => ['in', $gameIds], 'ios_game_id' => ['in', $gameIds]];
         } else {
-            $conditions = '1=1';
+            $conditions = '1<>1';
         }
         $games = M('base_game', 'tab_')->where($conditions)->select();