From b6014d80f2d8d2b8e712a3e0557e803bae105a48 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 8 Aug 2023 15:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/auth/AdminLogic.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php
index 872c13979..9bafa654e 100755
--- a/app/adminapi/logic/auth/AdminLogic.php
+++ b/app/adminapi/logic/auth/AdminLogic.php
@@ -240,20 +240,19 @@ class AdminLogic extends BaseLogic
         $admin = Admin::field([
             'id', 'account', 'name', 'disable', 'root',
             'multipoint_login', 'avatar', 'sex', 'province', 'city', 'area', 'street', 'address', 'qualification', 'is_contract', 'id_card,phone'
-        ])->with(['company' => function ($query) {
-            $query->field('id,company_name');
-        }])->findOrEmpty($params['id'])->toArray();
+        ])->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){
-            return Db::name('dict_data')->where('id',$data['contract_type'])->value('name');
-        })
-        ->find();
-        if (empty($admin['contract']['party_a'])) {
-            $admin['contract']['party_a_info'] = '';
-        } else {
-            $admin['contract']['party_a_info'] = Company::where(['id' => $admin['contract']['party_a']])->field('id,company_name,organization_code,master_name,master_phone,master_email')->find();
-        }
+        $admin['company']=Company::where(['admin_id'=>$admin['id']])->field('id,company_name')->find();
+        // $admin['contract']=Db::name('contract')->where('party_b',$params['id'])
+        // ->withAttr('contract_type_name',function($value,$data){
+        //     return Db::name('dict_data')->where('id',$data['contract_type'])->value('name');
+        // })
+        // ->find();
+        // if (empty($admin['contract']['party_a'])) {
+        //     $admin['contract']['party_a_info'] = '';
+        // } else {
+        //     $admin['contract']['party_a_info'] = Company::where(['id' => $admin['contract']['party_a']])->field('id,company_name,organization_code,master_name,master_phone,master_email')->find();
+        // }
         if ($action == 'detail') {
             return $admin;
         }