diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index a791f83..70df8cd 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -139,10 +139,10 @@ class Friend extends Model
         $user1 = min($user1_id, $user2_id);
         $user2 = max($user1_id, $user2_id);
         $friending_heart = db::name('vs_user_friending_heart')
-            ->where(['room_id'=>$room_id,'friend_id'=>$friend_id ,'user1_id' =>$user1,'user2_id' => $user2])->find();
+            ->where(['room_id'=>$room_id,'friend_id'=>$friend_id ,'user1_id' =>$user1,'user2_id' => $user2])->order('id desc')->find();
         $originalPairs = db::name('vs_user_friending_heart')
             ->where(['id'=>$friending_heart['id']])
-            ->save(['status' => 3,'friend_config_id' =>$friending_config_id]);
+            ->update(['status' => 3,'friend_config_id' =>$friending_config_id]);
         if ($originalPairs) {
             $relation = db::name('vs_relation')->where('id',$friending_config_id)->value('name');
             if($friending_heart['heart_value'] >= get_system_config_value('friend_heart_create_room')){
@@ -614,7 +614,7 @@ class Friend extends Model
                 }
                 db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $null_pit])->update(['user_id' => $value_change['user_id']]);
             }
-            $getRoomNullPit = $this->room_pit_model->where(['room_id'=>$room_id,'pit_number'=>['notin',[7,9]]])->select();
+//            $getRoomNullPit = $this->room_pit_model->where(['room_id'=>$room_id,'pit_number'=>['notin',[7,9]]])->select();
             $getRoomNullPit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7]])->select();
             $data_users = [];
             foreach($getRoomNullPit as $key_data => $value_data){