上传
This commit is contained in:
@@ -53,7 +53,7 @@ class FeishuController
|
||||
|
||||
$res = [];
|
||||
foreach ($certificate as $k => $v) {
|
||||
$res []=$k;
|
||||
$res []=['id'=>$k,'name'=>$k];
|
||||
}
|
||||
return Util::success($res,trans('success'));
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace app\controller;
|
||||
|
||||
use app\model\Country;
|
||||
use app\model\FeishuUser;
|
||||
use app\model\User;
|
||||
use app\service\MailService;
|
||||
@@ -178,6 +179,7 @@ class UserController
|
||||
$user->toArray();
|
||||
unset($user->password);
|
||||
$user['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
|
||||
$user['country_name'] = Country::where('id', $user['country_id'])->value('open_id');
|
||||
|
||||
return Util::success($user, trans('save_success'));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user