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 18:30:14 +08:00
parent f641a007ad
commit 26bc824cb8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/api/controller/ContractController.php
View File

@ -45,6 +45,7 @@ class ContractController extends BaseApiController
public function view($id)
{
halt();
$contract = Contract::find($id);
if (empty($contract)) {
return $this->fail('合同不存在');
@ -67,12 +68,12 @@ class ContractController extends BaseApiController
$company['company_type_name'] = Db::name('dict_data')->where('id', $company['company_type'])->value('name');
$company['other_contacts'] = json_decode($company['other_contacts'], true);
$company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : '';
$users = Admin::where('company_id', $company['party_a'])->field('id,name,account,phone,qualification')->select()->toArray();
foreach ($users as &$user) {
$user['is_main'] = $user['id'] == $company['admin_id'] ? 1 : 0;
$user['qualification'] = $user['qualification'] != null ? json_decode($user['qualification'], true) : [];
unset($user['role_id'], $user['dept_id'], $user['jobs_id'], $user['id']);
}
return $this->success('success', ['contract' => $contract, 'company' => $company, 'users' => $users]);
// $users = Admin::where('id', $company['party_a'])->field('id,name,account,phone,qualification')->select()->toArray();
// foreach ($users as &$user) {
// $user['is_main'] = $user['id'] == $company['admin_id'] ? 1 : 0;
// $user['qualification'] = $user['qualification'] != null ? json_decode($user['qualification'], true) : [];
// unset($user['role_id'], $user['dept_id'], $user['jobs_id'], $user['id']);
// }
return $this->success('success', ['contract' => $contract, 'company' => $company]);
}
}