From c95b98d5aff23561449efd5aeb533f038cc72317 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 21 Jul 2023 14:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/auth/AdminLogic.php | 6 ++++--
 app/common/model/auth/Admin.php        | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php
index 0ef3abeb7..9fdc3f3f6 100755
--- a/app/adminapi/logic/auth/AdminLogic.php
+++ b/app/adminapi/logic/auth/AdminLogic.php
@@ -215,9 +215,11 @@ class AdminLogic extends BaseLogic
     public static function detail($params, $action = 'detail'): array
     {
         $admin = Admin::field([
-            'id', 'account', 'name', 'disable', 'root',
+            'id', 'account', 'name', 'disable', 'root', 'company_id',
             'multipoint_login', 'avatar', 'sex', 'province', 'city', 'area', 'street', 'address', 'qualification', 'is_contract', 'id_card,phone'
-        ])->findOrEmpty($params['id'])->toArray();
+        ])->with(['company' => function ($query) {
+            $query->field('id,company_name');
+        }])->findOrEmpty($params['id'])->toArray();
         $admin['qualification'] = $admin['qualification']!=null?json_decode($admin['qualification'], true):[];
         $admin['contract']=Db::name('contract')->where('party_b',$params['id'])
         ->withAttr('contract_type_name',function($value,$data){
diff --git a/app/common/model/auth/Admin.php b/app/common/model/auth/Admin.php
index 3d1b0881b..98d6699ac 100755
--- a/app/common/model/auth/Admin.php
+++ b/app/common/model/auth/Admin.php
@@ -16,6 +16,7 @@ namespace app\common\model\auth;
 
 use app\common\enum\YesNoEnum;
 use app\common\model\BaseModel;
+use app\common\model\Company;
 use app\common\model\dept\Dept;
 use think\model\concern\SoftDelete;
 use app\common\service\FileService;
@@ -113,4 +114,9 @@ class Admin extends BaseModel
         return empty($value) ? FileService::getFileUrl(config('project.default_image.admin_avatar')) : FileService::getFileUrl(trim($value, '/'));
     }
 
+    public function company()
+    {
+        return $this->hasOne(Company::class, 'id', 'company_id');
+    }
+
 }
\ No newline at end of file