From 8f75d0f450c9433d588e83c15c6009d711b14d2e Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Mon, 16 Dec 2019 19:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/function.php         | 7 ++++++-
 Application/Admin/View/BehaviorLog/index.html | 8 --------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php
index c76087014..190eb19c6 100644
--- a/Application/Admin/Common/function.php
+++ b/Application/Admin/Common/function.php
@@ -553,7 +553,12 @@ function getGameByName($game_name=null, $sdk_version=null)
         $map['sdk_version'] = $sdk_version;
     }
     $result = D("Game")->where($map)->select();
-    return $result;
+    if(empty($result))
+    {
+        return [['id' => -1]];
+    }else{
+        return $result;
+    }
 }
 
 function getTopPromote($promote_id)
diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html
index 29461a493..9178333a7 100644
--- a/Application/Admin/View/BehaviorLog/index.html
+++ b/Application/Admin/View/BehaviorLog/index.html
@@ -217,14 +217,6 @@
                     layer.msg('时间间隔不能超过31天，请重新选择日期');
                     return false;
                 }
-                var game_name = $("#game_name").val();
-                var sdk_version = $("#sdk_version").val();
-                var server_name = $("#server_name").val();
-                console.log(server_name)
-                if(game_name != '' && server_name == '') {
-                    layer.msg('请选择区服');
-                    return false;
-                }
                 var url = $(this).attr('url');
                 var query = $('.jssearch').find('input').serialize();
                 query += "&" + $('.jssearch').find('select').serialize();