1

app/JsonRpc/NewsService.php

@@ -822,17 +822,17 @@ class NewsService implements NewsServiceInterface
       case 2:
       case 3:
       case 6:             //1.头条资讯;2.轮播图;3.推荐图;6.今日热点
-            $query = Article::where($where)
-            ->where('level','like','%'.$data['level'].'%')
-            ->orderBy('updated_at','desc');
-            break;
+        $query = Article::where($where)
+          ->where('level', 'like', '%' . $data['level'] . '%')
+          ->orderBy('updated_at', 'desc');
+        break;
       case 4:             //最新资讯
-            $query = Article::where($where)->orderBy('updated_at','desc');
-            break;
+        $query = Article::where($where)->orderBy('updated_at', 'desc');
+        break;
       case 5:             //资讯推荐
-            $query = Article::where($where)
-            ->where('updated_at', '>', $month);
-            break;
+        $query = Article::where($where)
+          ->where('updated_at', '>', $month);
+        break;
       case 7:             //资讯分类
 
         if (isset($data['id']) && !empty($data['id'])) {
@@ -4002,6 +4002,10 @@ class NewsService implements NewsServiceInterface
     if (isset($data['status']) && !empty($data['status'])) {
       $where[] = ['notice.status', '=', $data['status']];
     }
+    //type
+    if (isset($data['type_id']) && !empty($data['type_id'])) {
+      $where[] = ['notice.type_id', '=', $data['type_id']];
+    }
     var_dump($data, '------------11111-2----test---------');
     if ($data['type_id'] == 10000) {
       $result = Notice::when(!empty($data['status1']), function ($query) use ($data) {