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

Merge pull request '修复合同' (#15) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/15
This commit is contained in:
mkm 2023-08-03 11:40:05 +08:00
commit e467fe0a58
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

@ -25,7 +25,7 @@ class CompanyController extends BaseApiController
[$page, $limit] = $this->getPage();
$myCompany = Company::findOrEmpty($this->userInfo['company_id'])->toArray();
$companyIds = Contract::where('party_a', $myCompany['id'])->column('party_b');
$query = Company::whereIn('id', $companyIds)->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name']);
$query = Company::whereIn('id', $companyIds)->where('status',1)->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name']);
$count = $query->count();
$companies = $query->page($page)->limit($limit)->select()->each(function ($company) {
$company['other_contacts'] = json_decode($company['other_contacts'], true);