Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0

Application/Admin/Controller/BehaviorLogController.class.php

@@ -61,8 +61,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();

Application/Admin/Model/PromoteModel.class.php

@@ -390,6 +390,7 @@ class PromoteModel extends Model{
     {
 
         $where['level'] =  $level;
+        $userAuth = session('user_auth');
         setPowerPromoteIds($where,'id');
 
         $offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']];
@@ -399,7 +400,7 @@ class PromoteModel extends Model{
             $item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : "");
         }
 
-        if (in_array('0',explode(',',$where['id'][1]))) {
+        if (in_array('0',explode(',',$where['id'][1]))||$userAuth['data_empower_type']==1) {
             $result = array_merge($offcialData,$result);
 //            dump($result);die();
         }