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

手机端返回公司人员详情

Browse Source
This commit is contained in:
luofei 2023-07-22 11:26:25 +08:00
parent d28bbc9d8d
commit 8d8d65f312
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/api/controller/CompanyController.php
View File

@ -85,9 +85,24 @@ class CompanyController extends BaseApiController
$roleIds = AdminRole::where('admin_id', $user['id'])->column('role_id');
$user['roles'] = SystemRole::whereIn('id', $roleIds)->column('name');
$user['qualification'] = $user['qualification'] != null ? json_decode($user['qualification'], true) : [];
unset($user['role_id'], $user['dept_id'], $user['jobs_id'], $user['id']);
unset($user['role_id'], $user['dept_id'], $user['jobs_id']);
}
return $this->success('success', ['count' => $count, 'data' => $users]);
}
public function user($id)
{
$query = Admin::where('id', $id);
$user = $query->with(['company' => function ($query) {
$query->field('id,company_name');
}])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,sex,avatar,name,account,phone,qualification,province,city,area,street,is_contract,company_id')->find()->toArray();
$contract = Contract::whereRaw("(type=1 and party_b={$user['company_id']}) or (type=2 and party_b={$user['id']})")->append(['contract_type_name'])->find();
$user['contract'] = $contract;
$roleIds = AdminRole::where('admin_id', $user['id'])->column('role_id');
$user['roles'] = SystemRole::whereIn('id', $roleIds)->column('name');
$user['qualification'] = $user['qualification'] != null ? json_decode($user['qualification'], true) : [];
unset($user['role_id'], $user['dept_id'], $user['jobs_id']);
return $this->success('success', $user);
}
}

6
app/common/model/contract/Contract.php
View File

@ -52,4 +52,10 @@ class Contract extends BaseModel
{
return $this->hasOne(DictData::class, 'id', 'contract_type')->bind(['contract_type_name'=>'name']);
}
public function getContractTypeNameAttr($value)
{
return DictData::where(['id' => $this->contract_type])->value('name');
}
}