This commit is contained in:
mkm 2023-08-21 10:16:16 +08:00
parent 18c491baea
commit 87fbad724a

@ -125,7 +125,12 @@ class ContractLogic extends BaseLogic
$field = ['id,company_name,company_type,company_type company_type_name,organization_code,
province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name,
qualification'];
$company = Company::where(['id' => $data['party_b']])->field($field)->find()->toArray();
$company = Company::where(['id' => $data['party_b']])->field($field)->find();
if(empty($company)){
return self ::setError('公司不存在');
}else{
$user=$company->toArray();
}
$company['qualification'] = json_decode($company['qualification'], true);
if($company['qualification'] && isset($company['qualification']['other_qualifications'])){
$company['qualification']['other_qualifications']=json_decode($company['qualification']['other_qualifications'],true);
@ -135,7 +140,12 @@ class ContractLogic extends BaseLogic
$filed = ['id,id_card,avatar,nickname,sex,mobile,
province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,nickname master_name,
qualification'];
$user = User::where('id', $data['party_b'])->field($filed)->find()->toArray();
$user = User::where('id', $data['party_b'])->field($filed)->find();
if(empty($user)){
return self ::setError('用户不存在');
}else{
$user=$user->toArray();
}
$user['qualification'] = json_decode($user['qualification'], true);
if($user['qualification'] && isset($user['qualification']['other_qualifications'])){
$user['qualification']['other_qualifications']=json_decode($user['qualification']['other_qualifications'],true);