国家筛选
This commit is contained in:
@@ -78,6 +78,7 @@ class UserController
|
||||
unset($result['password']);
|
||||
$result['token'] = $token;
|
||||
// $result['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
|
||||
$result['feishu_openid'] = $result['openid']??'';
|
||||
|
||||
if (!Util::isEmpty($language)) {
|
||||
User::where('id', $userId)
|
||||
@@ -243,7 +244,8 @@ class UserController
|
||||
->first();
|
||||
$user->toArray();
|
||||
unset($user->password);
|
||||
$user['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
|
||||
// $user['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
|
||||
$user['feishu_openid'] = $user['openid']??'';
|
||||
$user['country_name'] = Country::where('id', $user['country_id'])->value('cn_addr');
|
||||
$ossservice = new \app\service\OssService();
|
||||
$user['avatar_url'] = $user['avatar'] ? $ossservice->generatePrivateUrl($user['avatar']) : '';
|
||||
|
||||
Reference in New Issue
Block a user