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