LiuJ 1 deň pred
rodič
commit
8e7f5dbe6f

+ 35 - 0
app/JsonRpc/NewsService.php

@@ -339,6 +339,36 @@ class NewsService implements NewsServiceInterface
       return Result::error("更新失败");
     }
   }
+  public function getArticleCommend(array $data): array
+  {
+    $where = [
+      'website_id' => $data['website_id'],
+    ];
+    $ids = WebsiteCategory::where($where)->pluck('category_id')->toArray();
+    var_dump($ids);
+    if (empty($ids)) {
+      return Result::error("没有推荐数据");
+    }
+    //id
+    if (isset($data['id'])) {
+      $whereArticle['id'] = $data['id'];
+    }
+    $article = Article::whereIn('catid', values: $ids)->where('status', 1)
+      ->where($whereArticle)
+      ->orderBy('id', 'desc')
+      ->paginate($data['pageSize'], ['*'], 'page', $data['page']);
+
+    if ($article) {
+      $data = [
+        'rows' => $article->items(),
+        'count' => $article->total(),
+      ];
+      return Result::success($data);
+    } else {
+      return Result::error("获取失败失败");
+    }
+  }
+
   /**
    * @param array $data
    * @return array
@@ -362,6 +392,11 @@ class NewsService implements NewsServiceInterface
     if (isset($data['category_name']) && $data['category_name']) {
       array_push($where, ['category.name', 'like', '%' . $data['category_name'] . '%']);
     }
+
+    if (isset($data['catid']) && $data['catid']) {
+      array_push($where,  ['article.catid', '=', $data['catid']]);
+    }
+
     if (isset($data['author']) && $data['author']) {
       array_push($where, ['article.author', '=', $data['author']]);
     }

+ 16 - 15
app/JsonRpc/NewsServiceInterface.php

@@ -368,56 +368,56 @@ interface NewsServiceInterface
      * @param array $data
      * @return array
      */
-    public function getWebsiteJobRecruiting(array $data):array;
+    public function getWebsiteJobRecruiting(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function checkWebsiteRoute(array $data):array;
+    public function checkWebsiteRoute(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteJobSelect(array $data):array;
+    public function getWebsiteJobSelect(array $data): array;
 
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteTsbb(array $data):array;
+    public function getWebsiteTsbb(array $data): array;
     /**
      *  @param array $data
      *  @return array
      */
-    public function getWebsiteTsbbList(array $data):array;
+    public function getWebsiteTsbbList(array $data): array;
     /**
      *      @param array $data
      *      @return array
      */
-    public function getWebsiteTsbbDetail(array $data):array;
-    public function getWebsiteLevelJob(array $data):array;
+    public function getWebsiteTsbbDetail(array $data): array;
+    public function getWebsiteLevelJob(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteCompany(array $data):array;
+    public function getWebsiteCompany(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteCompanyInfo(array $data):array;
+    public function getWebsiteCompanyInfo(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteCompanyList(array $data):array;
+    public function getWebsiteCompanyList(array $data): array;
 
     /**
      * 农网导航首页
      * @param array $data
      * @return array
      */
-    public function getWebsiteNwHomeList(array $data):array;
+    public function getWebsiteNwHomeList(array $data): array;
     // --------------企业管理-----------
     public function getCompanyList(array $data): array;
     public function addCompany(array $data): array;
@@ -436,20 +436,21 @@ interface NewsServiceInterface
      * @param array $data
      * @return array
      */
-    public function getWebsiteProject(array $data):array;
+    public function getWebsiteProject(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteProjectInfo(array $data):array;
+    public function getWebsiteProjectInfo(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteProjectList(array $data):array;
+    public function getWebsiteProjectList(array $data): array;
     /**
      * @param array $data
      * @return array
      */
-    public function getWebsiteCategoryJob(array $data):array;
+    public function getWebsiteCategoryJob(array $data): array;
+    public function getArticleCommend(array $data): array;
 }