更新
This commit is contained in:
parent
01a07648dd
commit
b6014d80f2
@ -240,20 +240,19 @@ class AdminLogic extends BaseLogic
|
|||||||
$admin = Admin::field([
|
$admin = Admin::field([
|
||||||
'id', 'account', 'name', 'disable', 'root',
|
'id', 'account', 'name', 'disable', 'root',
|
||||||
'multipoint_login', 'avatar', 'sex', 'province', 'city', 'area', 'street', 'address', 'qualification', 'is_contract', 'id_card,phone'
|
'multipoint_login', 'avatar', 'sex', 'province', 'city', 'area', 'street', 'address', 'qualification', 'is_contract', 'id_card,phone'
|
||||||
])->with(['company' => function ($query) {
|
])->findOrEmpty($params['id'])->toArray();
|
||||||
$query->field('id,company_name');
|
|
||||||
}])->findOrEmpty($params['id'])->toArray();
|
|
||||||
$admin['qualification'] = $admin['qualification']!=null?json_decode($admin['qualification'], true):[];
|
$admin['qualification'] = $admin['qualification']!=null?json_decode($admin['qualification'], true):[];
|
||||||
$admin['contract']=Db::name('contract')->where('party_b',$params['id'])
|
$admin['company']=Company::where(['admin_id'=>$admin['id']])->field('id,company_name')->find();
|
||||||
->withAttr('contract_type_name',function($value,$data){
|
// $admin['contract']=Db::name('contract')->where('party_b',$params['id'])
|
||||||
return Db::name('dict_data')->where('id',$data['contract_type'])->value('name');
|
// ->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'])) {
|
// ->find();
|
||||||
$admin['contract']['party_a_info'] = '';
|
// if (empty($admin['contract']['party_a'])) {
|
||||||
} else {
|
// $admin['contract']['party_a_info'] = '';
|
||||||
$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();
|
// } 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') {
|
if ($action == 'detail') {
|
||||||
return $admin;
|
return $admin;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user