Merge branch '20250210_lj_zhanqun' into dev

app/Controller/NewsController.php

@@ -569,6 +569,13 @@ class NewsController extends AbstractController
                 
              ]
          );
+         $user_id = Context::get("UserId");
+         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+         var_dump("用户信息：",$userInfo);
+         $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
+         $requireData['type_id'] = $type_id;
+         $requireData['user_id'] = $user_id;
+
          if ($validator->fails()) {
              $errorMessage = $validator->errors()->first();
              return Result::error($errorMessage);
@@ -639,6 +646,7 @@ class NewsController extends AbstractController
              $errorMessage = $validator->errors()->first();
              return Result::error($errorMessage);
          }
+         $requireData['user_id'] = context::get("UserId");
          $result = $this->newsServiceClient->addGood($requireData);
          return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
          }
@@ -967,6 +975,11 @@ class NewsController extends AbstractController
              $errorMessage = $validator->errors()->first();
              return Result::error($errorMessage);
          }
+         $user_id = Context::get("UserId");
+         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+         $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
+         $requireData['type_id'] = $type_id;
+         $requireData['user_id'] = $user_id;
          $result = $this->newsServiceClient->getJobHuntingList($requireData);
          return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
      }
@@ -989,16 +1002,14 @@ class NewsController extends AbstractController
      public function updateJobHunting(){
          $requireData = $this->request->all();
          $validator = $this->validationFactory->make($requireData,  
-             [
-                 'id'=> 'required',
-                 'title'=> 'required',
-                 'content'=> 'required',
-             ],
-             [
-                 'id.required' => 'id不能为空',
-                 'title.required' => '标题不能为空',
-                 'content.required' => '内容不能为空',
-             ]
+         [
+            'name'=> 'required',
+            'sexy'=> 'required',
+        ],
+        [
+            'name.required' => '姓名不能为空',
+            'sexy.required' => '性别不能为空',
+        ]
          ); if ($validator->fails()) {
              $errorMessage = $validator->errors()->first();
              return Result::error($errorMessage);
@@ -1007,20 +1018,23 @@ class NewsController extends AbstractController
          return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
      }
      public function addJobHunting(){
+        
          $requireData = $this->request->all();
          $validator = $this->validationFactory->make($requireData,
              [
-                 'title'=> 'required',
-                 'content'=> 'required',
+                 'name'=> 'required',
+                 'sexy'=> 'required',
              ],
              [
-                 'title.required' => '标题不能为空',
-                 'content.required' => '内容不能为空',
+                 'name.required' => '姓名不能为空',
+                 'sexy.required' => '性别不能为空',
              ]
-         ); if ($validator->fails()) {
+         ); 
+         if ($validator->fails()) {
              $errorMessage = $validator->errors()->first();
              return Result::error($errorMessage);
          }
+         $requireData['user_id'] = context::get("UserId");
          $result = $this->newsServiceClient->addJobHunting($requireData);
          return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
      }
@@ -1039,7 +1053,11 @@ class NewsController extends AbstractController
          }
          $result = $this->newsServiceClient->delJobHunting($requireData);
          return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
-         }
-
+    }
+    public function getJobHuntingData(){
+         $requireData = $this->request->all();
+         $result = $this->newsServiceClient->getJobHuntingData($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+     }
     //20250306  求职
 }

app/JsonRpc/NewsService.php

@@ -186,6 +186,9 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     public function updateJobHunting(array $data){
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getJobHuntingData(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
     //20250306  求职信息    
 
      //20250226  产品列表

app/JsonRpc/NewsServiceInterface.php

@@ -137,6 +137,7 @@ interface NewsServiceInterface
     public function addJobHunting(array $data);
     public function updateJobHunting(array $data);
     public function delJobHunting(array $data);
+    public function getJobHuntingData(array $data);
     //20250306  求职信息
 
      /**

config/api/news.php

@@ -38,8 +38,8 @@ Router::addGroup(
         Router::get('/selectWebsiteCategory', [NewsController::class, 'selectWebsiteArticle']);
         //获取导航池信息
         Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);
-         //前端-获取资讯列表
-         Router::get('/getWebsiteArticleList', [NewsController::class, 'getWebsiteArticleList']);
+        //前端-获取资讯列表
+        Router::get('/getWebsiteArticleList', [NewsController::class, 'getWebsiteArticleList']);
         //检测导航池名称是否存在
         Router::post('/checkCategoryName', [NewsController::class, 'checkCategoryName']);
 
@@ -87,6 +87,7 @@ Router::addGroup(
         Router::post('/addJobHunting', [NewsController::class, 'addJobHunting']);
         Router::post('/updateJobHunting', [NewsController::class, 'updateJobHunting']);
         Router::post('/delJobHunting', [NewsController::class, 'delJobHunting']);
+        Router::post('/getJobHuntingData', [NewsController::class, 'getJobHuntingData']);
         //20250306  求职信息
 
     },