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

Lyh server



查看合并请求 !3176

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Aside\Manage;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Requests\Aside\Manage\ManagerHrRequest;
+use App\Models\Geo\GeoConf;
 use App\Models\Manage\ManageHr;
 use App\Http\Logic\Aside\Manage\HrLogic;
 
@@ -121,4 +122,18 @@ class HrController extends BaseController
         $hrLogic->setSort();
         $this->response('success');
     }
+
+    /**
+     * @remark :获取geo项目负责人
+     * @name   :getGeoManagerList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/7 14:31
+     */
+    public function getGeoManagerList()
+    {
+        $geoConfModel = new GeoConf();
+        $geo_manage_list = $geoConfModel->geoManage();
+        $this->response('success',Code::SUCCESS,$geo_manage_list);
+    }
 }

@@ -360,6 +360,12 @@ class ProjectController extends BaseController
             }
 
         }
+        if(isset($this->param['geo_manage_id'])){
+            //geo项目负责人
+            $geoConfModel = new GeoConf();
+            $ids = $geoConfModel->selectField(['manager_id' => $this->param['geo_manage_id']], 'project_id');
+            $query = $query->whereIn('gl_project.id', $ids);
+        }
         return $query;
     }
 

@@ -35,8 +35,8 @@ class GeoWritingsTaskRequest extends FormRequest
             'company' => 'required|string',
             'brand' => 'required|string',
             'keyword' => 'required|string',
-            'prefix' => 'required|string',
-            'suffix' => 'required|string',
+//            'prefix' => 'required|string',
+//            'suffix' => 'required|string',
             'event_title' => 'required|string',
             'event_content' => 'required|string',
             'title' => 'required|string|max:120',

@@ -153,6 +153,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/info', [Aside\Manage\HrController::class, 'info'])->name('admin.hr_info');
             Route::post('/save', [Aside\Manage\HrController::class, 'save'])->name('admin.hr_save');
             Route::post('/sort', [Aside\Manage\HrController::class, 'sort'])->name('admin.hr_sort');
+            Route::post('/getGeoManagerList', [Aside\Manage\HrController::class, 'getGeoManagerList'])->name('admin.hr_getGeoManagerList');
             Route::any('/getSearchParamsList', [Aside\Manage\HrController::class, 'getSearchParamsList'])->name('admin.hr_getSearchParamsList');
         });