变更数据

@@ -133,7 +133,7 @@ class HrController extends BaseController
     public function getGeoManagerList()
     {
         $geoConfModel = new GeoConf();
-        $geo_manage_list = $geoConfModel->geoManage();
+        $geo_manage_list = $geoConfModel->geoManage($this->param['name'] ?? '');
         $this->response('success',Code::SUCCESS,$geo_manage_list);
     }
 }

@@ -24,15 +24,11 @@ class GeoConf extends Base
     protected $table = 'gl_project_geo_conf';
 
 
-    /**
-     * GEO 负责人集合
-     * TODO 负责人：优化师 + 陶婵 + 艾媛媛
-     * @return array
-     */
-    public function geoManage()
+    public function geoManage($name = '')
     {
         $key = 'geo_manage_list_' . date('Ymd');
         $optimize = Cache::get($key);
+
         if (empty($optimize)) {
             $optimize = ManageHr::where(['status' => ManageHr::STATUS_ONE, 'entry_position' => 46])->pluck('name', 'id')->toArray();
             $optimize[11] = '陶婵';
@@ -42,6 +38,15 @@ class GeoConf extends Base
             ksort($optimize);
             Cache::put($key, $optimize, 3600);
         }
+        // 如果传入了name，则返回对应的id+name
+        if ($name !== null) {
+            $id = array_search($name, $optimize);
+            if ($id !== false) {
+                // 按照原有格式返回，即 [id => name] 的数组格式
+                return [$id => $name];
+            }
+            return [];
+        }
         return $optimize;
     }
 }