房间用户头像 点击 工会展示
This commit is contained in:
@@ -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;
|
$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'] = 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;
|
$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;
|
||||||
|
|||||||
@@ -320,6 +320,14 @@ class User extends Model
|
|||||||
if($from_uid != $uid){
|
if($from_uid != $uid){
|
||||||
$this->add_user_visit_log(1,$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];
|
return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user