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

Merge pull request '更新区域字段' (#13) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/13
This commit is contained in:
mkm 2023-08-03 10:19:28 +08:00
commit 9250aa2e1c
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

@ -42,7 +42,7 @@ class CompanyController extends BaseApiController
$myCompany = Company::findOrEmpty($this->userInfo['company_id'])->toArray(); $myCompany = Company::findOrEmpty($this->userInfo['company_id'])->toArray();
$query = Company::where(['street' => $myCompany['street'], 'company_type' => [17, 18],'is_contract'=>0]); $query = Company::where(['street' => $myCompany['street'], 'company_type' => [17, 18],'is_contract'=>0]);
$count = $query->count(); $count = $query->count();
$companies = $query->select()->toArray(); $companies = $query->field('*,street street_name,area area_name,city city_name,province province_name')->select()->toArray();
return $this->success('', ['count' => $count, 'data' => $companies]); return $this->success('', ['count' => $count, 'data' => $companies]);
} }