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-24 17:51:00 +08:00
parent 67cfa69d6e
commit 12ef9ee7d7
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,7 @@ class CompanyController extends BaseApiController
$company['other_contacts'] = json_decode($company['other_contacts'], true); $company['other_contacts'] = json_decode($company['other_contacts'], true);
$company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : ''; $company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : '';
$contract = Contract::find($company['contract_id']); $contract = Contract::find($company['contract_id']);
if (empty($contract)) { if (!empty($contract)) {
return $this->fail('合同不存在');
}
if ($contract['admin_id'] != 0) { if ($contract['admin_id'] != 0) {
$contract['party_b_name'] = Admin::where('id', $contract['admin_id'])->value('name'); $contract['party_b_name'] = Admin::where('id', $contract['admin_id'])->value('name');
} else { } else {
@ -55,6 +53,7 @@ class CompanyController extends BaseApiController
$contract['party_a_name'] = Db::name('company')->where('id', $contract['party_a'])->value('company_name'); $contract['party_a_name'] = Db::name('company')->where('id', $contract['party_a'])->value('company_name');
$contract['contract_type_name'] = Db::name('dict_data')->where('id', $contract['contract_type'])->value('name'); $contract['contract_type_name'] = Db::name('dict_data')->where('id', $contract['contract_type'])->value('name');
}
$company['company_type_name'] = Db::name('dict_data')->where('id', $company['company_type'])->value('name'); $company['company_type_name'] = Db::name('dict_data')->where('id', $company['company_type'])->value('name');
$users = Admin::where('company_id', $company['id'])->field('id,name,account,phone,qualification')->select()->toArray(); $users = Admin::where('company_id', $company['id'])->field('id,name,account,phone,qualification')->select()->toArray();
foreach ($users as &$user) { foreach ($users as &$user) {
@ -62,7 +61,7 @@ class CompanyController extends BaseApiController
$user['qualification'] = $user['qualification'] != null ? json_decode($user['qualification'], true) : []; $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'], $user['id']);
} }
return $this->success('success', ['contract' => $contract, 'company' => $company, 'users' => $users]); return $this->success('success', ['contract' => $contract ?? [], 'company' => $company, 'users' => $users]);
} }
public function areaManager() public function areaManager()