Merge branch '20250605_company_fr'

app/Controller/PublicController.php

@@ -1714,7 +1714,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
          }
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->getCompanyList($requireData);
+        $result = $this->newsServiceClient->getCompanyList($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -1741,7 +1741,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
          }
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->addCompany($requireData);
+        $result = $this->newsServiceClient->addCompany($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -1756,13 +1756,13 @@ class PublicController extends AbstractController
             [
                 'id' =>'required',
                 'website_id' =>'required',
-                'category_id' =>'required',
+                'cat_arr_id' =>'required',
                 'title' =>'required',
             ],
             [
                 'id.required' => 'id不能为空',
                 'website_id.required' => '网站名称不能为空',
-                'category_id.required' => '网站名称不能为空',
+                'cat_arr_id.required' => '栏目不能为空',
                 'title.required' => '标题不能为空',
             ]
         );
@@ -1771,7 +1771,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
          }
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->upCompany($requireData);
+        $result = $this->newsServiceClient->upCompany($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -1795,7 +1795,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
          }
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->delCompany($requireData);
+        $result = $this->newsServiceClient->delCompany($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -1821,7 +1821,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
          }
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->checkCompany($requireData);
+        $result = $this->newsServiceClient->checkCompany($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -1845,7 +1845,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
          }
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->getCompanyInfo($requireData);
+        $result = $this->newscServiceClient->getCompanyInfo($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
 }

app/JsonRpc/NewsService.php

@@ -747,4 +747,28 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getCompanyList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function upCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function checkCompany(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getCompanyInfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -396,4 +396,17 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteNwHomeList(array $data);
+    // 企业管理
+    // 获取企业列表
+    public function getCompanyList(array $data);
+    // 添加企业
+    public function addCompany(array $data);
+    // 更新企业
+    public function upCompany(array $data);
+    // 删除企业
+    public function delCompany(array $data);
+    // 审核企业
+    public function checkCompany(array $data);
+    // 获取企业信息
+    public function getCompanyInfo(array $data);
 }

app/JsonRpc/PublicRpcService.php

@@ -386,28 +386,5 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function getCompanyList(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    public function addCompany(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    public function upCompany(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    public function delCompany(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    public function checkCompany(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    public function getCompanyInfo(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
+
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -207,17 +207,5 @@ interface PublicRpcServiceInterface
     // 5.保存到草稿箱
     public function saveWebsiteTemplate(array $data);
 
-    // 企业管理
-    // 获取企业列表
-    public function getCompanyList(array $data);
-    // 添加企业
-    public function addCompany(array $data);
-    // 更新企业
-    public function upCompany(array $data);
-    // 删除企业
-    public function delCompany(array $data);
-    // 审核企业
-    public function checkCompany(array $data);
-    // 获取企业信息
-    public function getCompanyInfo(array $data);
+
 }