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

Lyh server



查看合并请求 !3349

@@ -30,7 +30,7 @@ class GeoConf extends Base
         if (!empty($name)) {
             $optimize = ManageHr::where(function($query) {
                 $query->where(['status' => ManageHr::STATUS_ONE, 'entry_position' => 46])
-                    ->orWhereIn('id', [11, 207, 875, 893]);
+                    ->orWhereIn('id', [11, 207, 875, 893, 897, 898]);
             })->where('name', 'like', '%' . $name . '%')
                 ->pluck('name', 'id')
                 ->toArray();
@@ -44,7 +44,7 @@ class GeoConf extends Base
         if (empty($optimize)) {
             $optimize = ManageHr::where(function($query) {
                 $query->where(['status' => ManageHr::STATUS_ONE, 'entry_position' => 46])
-                    ->orWhereIn('id', [11, 207, 875, 893]);
+                    ->orWhereIn('id', [11, 207, 875, 893, 897, 898]);
             })->pluck('name', 'id')->toArray();
             ksort($optimize);
             Cache::put($key, $optimize, 3600);