From 2ba055d5e93086c960cd6a84b51d5997c99166f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 5 Dec 2025 17:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=20=20=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/User.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/application/api/model/User.php b/application/api/model/User.php
index 63f64c9..27cc910 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -215,6 +215,17 @@ class User extends Model
         $user_info['market_value_coin'] = $coin_market_value[0];
         $user_info['market_value_market'] = $coin_market_value[1];
 
+        //用户所属工会
+        $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$uid,'delete_time'=>0,'status' => 1])->value('guild_id');
+        if($guild_id){
+            $user_info['guild_id'] = $guild_id;
+            $user_info['guild_name'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_name');
+        }else{
+            $user_info['guild_id'] = null;
+            $user_info['guild_name'] = null;
+        }
+
+
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
 
@@ -407,9 +418,11 @@ class User extends Model
         //用户所属工会
         $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');
+            $user_info['guild_id'] = $guild_id;
+            $user_info['guild_name'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_name');
         }else{
-            $user_info['guild'] = '';
+            $user_info['guild_id'] = null;
+            $user_info['guild_name'] = null;
         }
         $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];