Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/news_producer

app/JsonRpc/NewsService.php

@@ -114,6 +114,9 @@ class NewsService implements NewsServiceInterface
      */
     public function addCategory(array $data): array
     {
+        if(isset($data['id'])){
+            unset($data['id']);
+        }
         $id = Category::insertGetId($data);
         if (empty($id)) {
             return Result::error("添加失败");
@@ -738,12 +741,18 @@ class NewsService implements NewsServiceInterface
         if (empty($result)) {
             return Result::error("暂无此新闻！", 0);
         }
-        $category = WebsiteCategory::where('website_id', $data['website_id'])->where(['category_id' => $result['catid']])->first();
+        $category = WebsiteCategory::leftJoin('website', 'website.id', '=', 'website_category.website_id')
+            ->select('website_category.*', 'website.website_name', 'website.suffix')
+            ->where('website_category.website_id', $data['website_id'])
+            ->where(['website_category.category_id' => $result['catid']])
+            ->first();
         if (empty($category)) {
             return Result::error("查询失败", 0);
         }
         $result['category_id'] = $category['category_id'];
         $result['cat_name'] = $category['alias'];
+        $result['website_name'] = $category['website_name']??"";
+        $result['suffix'] = $category['suffix']??"";
         return Result::success($result);
     }