调整公司信息返回

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);
+    }
+
 }

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');
+    }
     
 }

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');
+    }
+
 }