变更数据

@@ -26,27 +26,30 @@ class GeoConf extends Base
 
 
     public function geoManage($name = '')
     public function geoManage($name = '')
     {
     {
+        // 如果有搜索条件，直接查询（不缓存）
+        if (!empty($name)) {
+            $optimize = ManageHr::where(function($query) {
+                $query->where(['status' => ManageHr::STATUS_ONE, 'entry_position' => 46])
+                    ->orWhereIn('id', [11, 207, 875, 893]);
+            })->where('name', 'like', '%' . $name . '%')
+                ->pluck('name', 'id')
+                ->toArray();
+
+            ksort($optimize);
+            return $optimize;
+        }
+        // 没有搜索条件时使用缓存
         $key = 'geo_manage_list_' . date('Ymd');
         $key = 'geo_manage_list_' . date('Ymd');
         $optimize = Cache::get($key);
         $optimize = Cache::get($key);
-
         if (empty($optimize)) {
         if (empty($optimize)) {
-            $optimize = ManageHr::where(['status' => ManageHr::STATUS_ONE, 'entry_position' => 46])->pluck('name', 'id')->toArray();
-            $optimize[11] = '陶婵';
-            $optimize[207] = '吴雨静';
-            $optimize[875] = '艾媛媛';
-            $optimize[893] = '杨汀';
+            $optimize = ManageHr::where(function($query) {
+                $query->where(['status' => ManageHr::STATUS_ONE, 'entry_position' => 46])
+                    ->orWhereIn('id', [11, 207, 875, 893]);
+            })->pluck('name', 'id')->toArray();
+
             ksort($optimize);
             ksort($optimize);
             Cache::put($key, $optimize, 3600);
             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;
         return $optimize;
     }
     }
 }
 }