From 611d13c1c63314c11778c8b83ee0b3efe70840d0 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 26 Nov 2019 22:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86->=E5=85=85=E5=80=BC=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6|=E5=9B=A2=E9=98=9F/=E6=8E=A8=E5=B9=BF=E5=91=98?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/QueryController.class.php      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 9ecc5f8e2..bfa3f4c86 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1745,8 +1745,10 @@ class QueryController extends BaseController
             $map = ['uc.promote_id' => ['in', $ids]];
             $subMap = ['promote_id' => ['in', $ids]];
 
-            if ($relationGameId != 0) {
-                $gameMap['relation_game_id'] = $relationGameId;
+            if ($relationGameId != 0 || $sdkVersion != 0) {
+                if ($relationGameId != 0) {
+                    $gameMap['relation_game_id'] = $relationGameId;
+                }
                 if ($sdkVersion != 0) {
                     $gameMap['sdk_version'] = $sdkVersion;
                 }
@@ -2000,9 +2002,11 @@ class QueryController extends BaseController
             'isContainSubs' => true,
             'basicPromotes' => $basicPromotes,
         ];
-        if ($relationGameId > 0) {
-            $gameMap['relation_game_id'] = $relationGameId;
-            if ($sdkVersion > 0) {
+        if ($relationGameId != 0 || $sdkVersion != 0) {
+            if ($relationGameId != 0) {
+                $gameMap['relation_game_id'] = $relationGameId;
+            }
+            if ($sdkVersion != 0) {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
             $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true);