合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3177

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

@@ -24,21 +24,28 @@ class GeoConf extends Base
     protected $table = 'gl_project_geo_conf';
     protected $table = 'gl_project_geo_conf';
 
 
 
 
-    /**
-     * GEO 负责人集合
-     * TODO 负责人：优化师 + 陶婵 + 艾媛媛
-     * @return array
-     */
-    public function geoManage()
+    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);
         }
         }