From 7c9c82b208cda5c1b95fa900afc9041c7f7e8d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Wed, 3 Dec 2025 14:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/RoomPit.php | 36 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 0ef2230..a344395 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -458,6 +458,7 @@ class RoomPit extends Model
             'a.status'  => 0,
         ];
 
+        //常规通道 type： 0普通通道，1优先通道
         $list['regular'] = db::name('vs_room_pit_apply')->alias('a')->join('user b','a.user_id = b.id')
             ->where($where)->where('a.type',0)->field('a.user_id,a.rank_value,b.nickname,b.avatar')
             ->order('a.rank_value desc')->select();
@@ -483,25 +484,26 @@ class RoomPit extends Model
             //把特殊用户放在最前面
             array_unshift($list['special'],$special);
         }
-        foreach ($list['special'] as $k => $v){
-            //查询用户的爵位
-            $juewei = model('Nobility')->getUserNobilityInfo($v['user_id']);
-            if($juewei){
-                $v['jue_wei'] = $juewei;
-            }else{
-                $v['jue_wei'] = [
-                    'level' => 0,
-                ];
+        if($list['special']){
+            foreach ($list['special'] as $k => $v){
+                //查询用户的爵位
+                $juewei = model('Nobility')->getUserNobilityInfo($v['user_id']);
+                if($juewei){
+                    $v['jue_wei'] = $juewei;
+                }else{
+                    $v['jue_wei'] = [
+                        'level' => 0,
+                    ];
+                }
             }
+            //先根据$v['jue_wei'] 下面的level 由大到小排序，再根据$v['rank_value'] 由大到小排序level
+            usort($list['special'], function($a, $b) {
+                if ($a['jue_wei']['level'] == $b['jue_wei']['level']) {
+                    return $b['rank_value'] - $a['rank_value'];
+                }
+                return $b['jue_wei']['level'] - $a['jue_wei']['level'];
+            });
         }
-        //先根据$v['jue_wei'] 下面的level 由大到小排序，再根据$v['rank_value'] 由大到小排序level
-        usort($list['regular'], function($a, $b) {
-            if ($a['jue_wei']['level'] == $b['jue_wei']['level']) {
-                return $b['rank_value'] - $a['rank_value'];
-            }
-            return $b['jue_wei']['level'] - $a['jue_wei']['level'];
-        });
-
 
         $list['gift_info'] = db::name('vs_room_pit_apply_help_gift')->where('room_id',$room_id)->find();
         if($list['gift_info']){