From fa79b544f8fdd3947d55f9808ac1a51a76f05d09 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 31 Jul 2023 09:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/UserLogic.php | 8 ++------ app/common/model/user/User.php | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/api/logic/UserLogic.php b/app/api/logic/UserLogic.php index 87a17e0ee..fef84a44e 100755 --- a/app/api/logic/UserLogic.php +++ b/app/api/logic/UserLogic.php @@ -73,12 +73,8 @@ class UserLogic extends BaseLogic */ public static function info(int $userId) { - $user = User::where(['id' => $userId])->with(['admin' => [ - 'company' => function ($query) { - $query->field('id,company_name'); - } - ]]) - ->field('id,sn,sex,account,password,nickname,real_name,avatar,mobile,create_time,user_money,income,admin_id') + $user = User::where(['id' => $userId])->with(['admin','company']) + ->field('id,sn,sex,account,password,nickname,real_name,avatar,mobile,create_time,user_money,income,admin_id,company_id') ->findOrEmpty(); // $user['avatar'] = $user['avatar'] ? Request()->host() . $user['avatar'] : $user['avatar']; $user['has_password'] = !empty($user['password']); diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index 64cfed443..d17ca12b1 100755 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -21,6 +21,7 @@ use app\common\model\auth\Admin; use app\common\model\BaseModel; use app\common\service\FileService; use think\model\concern\SoftDelete; +use app\common\model\Company; /** * 用户模型 @@ -178,4 +179,9 @@ class User extends BaseModel return $this->hasOne(Admin::class, 'id', 'admin_id')->field('id,name,company_id,avatar'); } + public function company() + { + return $this->hasOne(Company::class, 'id', 'company_id')->field(['id','company_name','admin_id']); + } + } \ No newline at end of file