diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 9be5a3974..1abf42a5d 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -41,7 +41,7 @@ class CompanyController extends BaseApiController $myCompany = Company::findOrEmpty($this->userInfo['company_id'])->toArray(); $query = Company::where(['street' => $myCompany['street'], 'company_type' => [17, 18], 'is_contract' => 0])->where('id','<>',$this->userInfo['company_id']); $count = $query->count(); - $companies = $query->field('*,street street_name,area area_name,city city_name,province province_name')->select()->toArray(); + $companies = $query->field('*,street street_name,area area_name,city city_name,province province_name,village village_name,brigade brigade_name')->select()->toArray(); return $this->success('', ['count' => $count, 'data' => $companies]); } @@ -56,7 +56,7 @@ class CompanyController extends BaseApiController if (!$query) { return $this->fail('公司不存在'); } - $company = $query->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name'])->toArray(); + $company = $query->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name','village_name','brigade_name'])->toArray(); $company['other_contacts'] = json_decode($company['other_contacts'], true); $company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : ''; if($company['qualification'] && isset($company['qualification']['other_qualifications'])){ diff --git a/app/common/model/Company.php b/app/common/model/Company.php index 62dcdbc6c..3e974abba 100644 --- a/app/common/model/Company.php +++ b/app/common/model/Company.php @@ -53,6 +53,15 @@ class Company extends BaseModel return Db::name('geo_street')->where(['street_code' => $this->street])->value('street_name'); } + public function getVillageNameAttr($value) + { + return Db::name('geo_village')->where(['village_code' => $this->village])->value('village_name'); + } + + public function getBrigadeNameAttr($value) + { + return Db::name('geo_brigade')->where(['id' => $this->brigade])->value('brigade_name'); + } public function getAreaManagerNameAttr($value) { return Db::name('admin')->where(['id' => $this->area_manager])->value('name');