From e15a54b13c0172d1f3e130a4d394e514a23c4884 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Fri, 21 Jul 2023 14:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=AC=E5=8F=B8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=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 | 8 ++++++++ app/common/model/Company.php | 5 +++++ app/common/model/auth/Admin.php | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index c039d4869..d3a3aad6d 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -3,6 +3,7 @@ namespace app\api\controller; use app\common\model\auth\Admin; +use app\common\model\auth\AdminRole; use app\common\model\Company; use app\common\model\contract\Contract; use think\facade\Db; @@ -63,4 +64,11 @@ class CompanyController extends BaseApiController return $this->success('success', ['contract' => $contract, 'company' => $company, 'users' => $users]); } + public function areaManager() + { + $adminIds = AdminRole::where('role_id', 8)->column('admin_id'); + $data = Admin::wherein('id', $adminIds)->field('id,name,account,avatar,province,city,area,street')->select()->toArray(); + return $this->success('success', $data); + } + } \ No newline at end of file diff --git a/app/common/model/Company.php b/app/common/model/Company.php index cd157724d..1f1b36639 100644 --- a/app/common/model/Company.php +++ b/app/common/model/Company.php @@ -51,5 +51,10 @@ class Company extends BaseModel { return Db::name('geo_street')->where(['street_code' => $value])->value('street_name'); } + + public function getAreaManagerAttr($value) + { + return Db::name('admin')->where(['id' => $value])->value('name'); + } } \ No newline at end of file diff --git a/app/common/model/auth/Admin.php b/app/common/model/auth/Admin.php index 98d6699ac..b1e37af8d 100755 --- a/app/common/model/auth/Admin.php +++ b/app/common/model/auth/Admin.php @@ -18,6 +18,7 @@ use app\common\enum\YesNoEnum; use app\common\model\BaseModel; use app\common\model\Company; use app\common\model\dept\Dept; +use think\facade\Db; use think\model\concern\SoftDelete; use app\common\service\FileService; @@ -119,4 +120,24 @@ class Admin extends BaseModel return $this->hasOne(Company::class, 'id', 'company_id'); } + public function getProvinceAttr($value) + { + return Db::name('geo_province')->where(['province_code' => $value])->value('province_name'); + } + + public function getCityAttr($value) + { + return Db::name('geo_city')->where(['city_code' => $value])->value('city_name'); + } + + public function getAreaAttr($value) + { + return Db::name('geo_area')->where(['area_code' => $value])->value('area_name'); + } + + public function getStreetAttr($value) + { + return Db::name('geo_street')->where(['street_code' => $value])->value('street_name'); + } + } \ No newline at end of file