mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-08 15:59:48 +08:00
parent 01a07648dd
commit b6014d80f2
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/adminapi/logic/auth/AdminLogic.php
View File

@ -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;
}