国庆更新代码

application/api/model/Room.php

@@ -2254,7 +2254,7 @@ class Room extends Model
             ->join('user c','a.user_id2 = c.id','left')
             ->join('vs_relation d','a.relation_id = d.id','left')//关系
             ->field('a.relation_id,a.cp_room_id,a.id,a.user_id1,a.user_id2,a.updatetime,a.time_day,a.end_time,b.nickname as nickname1,b.avatar as avatar1,c.nickname as nickname2,c.avatar as avatar2,d.name as relation_name,d.icon as image')
-            ->where(['a.user_id1' => $user_id,'a.end_time' =>['>',time()],'a.delete_time' => 0,'d.id' => ['>',0]])
+            ->where(['a.user_id1' => $user_id,'a.end_time' =>['>',time()],'a.delete_time' => 0,'a.relation_id' => ['>',0]])
             ->order('a.updatetime desc')
             ->select();
         $room_auction2 = db::name('vs_room_auction_relation')->alias('a')
@@ -2262,7 +2262,7 @@ class Room extends Model
             ->join('user c','a.user_id2 = c.id','left')
             ->join('vs_relation d','a.relation_id = d.id','left')//关系
             ->field('a.relation_id,a.cp_room_id,a.id,a.user_id1,a.user_id2,a.updatetime,a.time_day,a.end_time,b.nickname as nickname1,b.avatar as avatar1,c.nickname as nickname2,c.avatar as avatar2,d.name as relation_name,d.icon as image')
-            ->where(['a.user_id2' => $user_id,'a.end_time' =>['>',time()],'a.delete_time' => 0])
+            ->where(['a.user_id2' => $user_id,'a.end_time' =>['>',time()],'a.delete_time' => 0,'a.relation_id' => ['>',0]])
             ->order('a.updatetime desc')
             ->select();
 
@@ -2555,7 +2555,7 @@ class Room extends Model
     public function user_reconnect($user_id,$room_id)
     {
         if(!$room_id){
-            $room_id = Db::name('user_data')->where('user_id', $user_id)->value('room_id');
+            // $room_id = Db::name('user_data')->where('user_id', $user_id)->value('room_id');
         }
         if(!$room_id){
             return ['code' => 0, 'msg' => '参数错误', 'data' => null];