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

Merge pull request '更新' (#24) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/24
This commit is contained in:
mkm 2023-08-03 15:52:08 +08:00
commit abd3da6f1d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ class CompanyController extends BaseApiController
$company = $query->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name'])->toArray();
$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']);
$contract = Contract::where('party_b',$id)->find();
if (!empty($contract)) {
if ($contract['admin_id'] != 0) {
$contract['party_b_name'] = Admin::where('id', $contract['admin_id'])->value('name');