Merge branch 'hotfix/log1.1' of wmtx/platform into master

行为日志显示bug

Application/Admin/Controller/BehaviorLogController.class.php

@@ -58,8 +58,13 @@ class BehaviorLogController extends ThinkController
             if(empty($v['extend'])) {
                 $data[$k]['extend'] = $v['order_id'];
             }
-            if ($v['server_id'] > 0){
+            if ($v['server_id'] > 0 && !empty($v['extend'])){
                 $data[$k]['server_name'] = M('server', 'tab_')->where(['game_id' => $v['game_id'],'server_num' =>$v['server_id']])->getField('server_name');
+            } else {
+                $data[$k]['server_name'] = '';
+                $data[$k]['game_player_name'] = '';
+                $data[$k]['game_player_id'] = '';
+                
             }
         }
         $count = M('pay_info', 'tab_')->where($map)->count();