From 210d87365aff306b85784762e61e57295871a82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 26 Aug 2025 16:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=94=A8=E6=88=B7=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=20=E7=82=B9=E5=87=BB=20=E5=B7=A5=E4=BC=9A=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 2 +-
 application/api/model/User.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index aa3fcfb..414df16 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1531,7 +1531,7 @@ class Room extends Model
         //是否设置开播提醒
         $user_info['is_open_live_remind'] = db::name('vs_user_live_remind')->where(['user_id' => $uid,'remind_user_id' => $user_id])->find() ? 1 : 0;
         //用户所属工会
-        $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'status'=>1,'delete_time'=>null])->value('guild_id');
+        $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'status'=>1,'delete_time'=>0])->value('guild_id');
 
         $user_info['is_mute'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 1])->find() ? 1 : 0;
         $user_info['is_mute_pit'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 2])->find() ? 1 : 0;
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 7ace1cd..44a8783 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -320,6 +320,14 @@ class User extends Model
         if($from_uid != $uid){
             $this->add_user_visit_log(1,$from_uid, $uid);
         }
+
+        //用户所属工会
+        $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$uid,'status'=>1,'delete_time'=>0])->value('guild_id');
+        if($guild_id){
+            $user_info['guild'] = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name');
+        }else{
+            $user_info['guild'] = '';
+        }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }