From 12ef9ee7d7aab9eeb32d2856190d08c67a210ef2 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 24 Jul 2023 17:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/CompanyController.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 6e121ac07..d5b45f94c 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -44,17 +44,16 @@ class CompanyController extends BaseApiController $company['other_contacts'] = json_decode($company['other_contacts'], true); $company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : ''; $contract = Contract::find($company['contract_id']); - if (empty($contract)) { - return $this->fail('合同不存在'); - } - if ($contract['admin_id'] != 0) { - $contract['party_b_name'] = Admin::where('id', $contract['admin_id'])->value('name'); - } else { - $contract['party_b_name'] = Db::name('company')->where('id', $contract['party_b'])->value('company_name'); - } - $contract['party_a_name'] = Db::name('company')->where('id', $contract['party_a'])->value('company_name'); + if (!empty($contract)) { + if ($contract['admin_id'] != 0) { + $contract['party_b_name'] = Admin::where('id', $contract['admin_id'])->value('name'); + } else { + $contract['party_b_name'] = Db::name('company')->where('id', $contract['party_b'])->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'); $users = Admin::where('company_id', $company['id'])->field('id,name,account,phone,qualification')->select()->toArray(); foreach ($users as &$user) { @@ -62,7 +61,7 @@ class CompanyController extends BaseApiController $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]); + return $this->success('success', ['contract' => $contract ?? [], 'company' => $company, 'users' => $users]); } public function areaManager()