diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 20d70cd..78cd0f3 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -468,30 +468,33 @@ class Friend extends Model
                 ->where(array('room_id'=>$room_id,'friend_id'=>$friend_id ,'id'=>array('notin',$heart_ids)))
                 ->limit($make_up_num)
                 ->order('heart_value DESC')->select();
-            foreach ($ranking_make_up as $rel1) {
-                $heart_ids[] = $rel1['id'];
-                if(in_array($rel1['user1_id'], $usedUsers) && in_array($rel1['user2_id'], $usedUsers)){
-                    continue;
-                }
-                if(in_array($rel1['user1_id'], $usedUsers)){
-                    $ranking2[] = [
-                        'heart_value' => 0,
-                        'id' => $rel1['id'],
-                        'user1_id' => -1,
-                        'user2_id' => $rel1['user2_id'],
-                    ];
-                    $usedUsers[] = $rel1['user2_id'];
-                }
-                if(in_array($rel1['user2_id'], $usedUsers)){
-                    $ranking2[] = [
-                        'heart_value' => 0,
-                        'id' => $rel1['id'],
-                        'user1_id' => $rel1['user1_id'],
-                        'user2_id' => -1,
-                    ];
-                    $usedUsers[] = $rel1['user1_id'];
+            if($ranking_make_up){
+                foreach ($ranking_make_up as $rel1) {
+                    $heart_ids[] = $rel1['id'];
+                    if(in_array($rel1['user1_id'], $usedUsers) && in_array($rel1['user2_id'], $usedUsers)){
+                        continue;
+                    }
+                    if(in_array($rel1['user1_id'], $usedUsers)){
+                        $ranking2[] = [
+                            'heart_value' => 0,
+                            'id' => $rel1['id'],
+                            'user1_id' => -1,
+                            'user2_id' => $rel1['user2_id'],
+                        ];
+                        $usedUsers[] = $rel1['user2_id'];
+                    }
+                    if(in_array($rel1['user2_id'], $usedUsers)){
+                        $ranking2[] = [
+                            'heart_value' => 0,
+                            'id' => $rel1['id'],
+                            'user1_id' => $rel1['user1_id'],
+                            'user2_id' => -1,
+                        ];
+                        $usedUsers[] = $rel1['user1_id'];
+                    }
                 }
             }
+
         }
         return array_merge($ranking_rut, $ranking2);
     }
@@ -514,7 +517,8 @@ class Friend extends Model
         if($heart_data){
             //排麦位
             $pit_unique = [];
-            foreach($heart_data as $key => $value) {
+            $key = 0;
+            foreach($heart_data as $value) {
                 //这条数据有一个用户已经排过了，就剔除这条数据
                 if(count($pit) >= 6){
                     break;
@@ -532,7 +536,7 @@ class Friend extends Model
                     }
                 }
 
-                if($value['user1_id']!=-1 && $value['user2_id']!=-1){
+                if($value['user1_id'] != -1 && $value['user2_id'] != -1){
                     if(!in_array($value['user1_id'],$pit_unique)){
                         $pit[$pit_number_array_reverse[$key]] = $value['user1_id'];
                     }
@@ -544,6 +548,7 @@ class Friend extends Model
                 //用户去重
                 $pit_unique[] = $value['user1_id'];
                 $pit_unique[] = $value['user2_id'];
+                $key++;
             }
         }
         return array_flip($pit);
@@ -569,7 +574,8 @@ class Friend extends Model
                     $pit_null = model('api/RoomPit')->getRoomNullPitWithout($room_id, [7,8,9,10]);
                     if($pit_null){
 //                        $this->room_pit_model->getOnPit($this->room_id, $value, $pit_null);
-                        db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_null])->update(['user_id' => $value]);
+                        model('api/RoomPit')->OnPit($value, $room_id, $pit_null);
+//                        db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_null])->update(['user_id' => $value]);
                     }else{
                         //下麦
                         $UserRoomPit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $value])->value('pit_number');