weight

app/Repositories/PostRepositories.php

@@ -362,8 +362,6 @@ class PostRepositories
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
 
         return $this->post
-            ->join('post_data', 'post_data.post_id', '=', 'post.id')
-            ->select('post.*')
             ->where(function($query) use ($request){
                 if(isset($request['keyword'])){
                     $query->where('title', 'like', "%{$request['keyword']}%")
@@ -375,9 +373,9 @@ class PostRepositories
                     $topicIds = json_decode($request['topic_ids'], true);
                     foreach ($topicIds as $key=>$id) {
                         if ($key==0) {
-                            $query->whereRaw('FIND_IN_SET('.$id.', post.topic_ids)');
+                            $query->whereRaw('FIND_IN_SET('.$id.', topic_ids)');
                         } else {
-                            $query->orWhereRaw('FIND_IN_SET('.$id.', post.topic_ids)');
+                            $query->orWhereRaw('FIND_IN_SET('.$id.', topic_ids)');
                         }
                     }
                 }
@@ -410,30 +408,26 @@ class PostRepositories
                 }
                 Log::debug('热门视频ids'.$ids);
                 return $this->post
-                    ->join('post_data', 'post_data.post_id', '=', 'post.id')
-                    ->select('post.*', DB::raw("IF (post.id = {$id},1,0) as sort"))
+                    ->select('*', DB::raw("IF (id = {$id},1,0) as sort"))
                     ->where($where)
-                    ->whereIn('post.id', explode(',', $ids))
+                    ->whereIn('id', explode(',', $ids))
                     ->orderBy('sort', 'desc')
-                    ->orderByRaw(DB::raw("FIELD(post.id,{$ids})"))
+                    ->orderByRaw(DB::raw("FIELD(id,{$ids})"))
                     ->paginate($perPage);
             }elseif($request['type'] == 'one'){
-                $where[] = ['post.id', $id];
+                $where[] = ['id', $id];
                 return $this->post
-                    ->join('post_data', 'post_data.post_id', '=', 'post.id')
-                    ->select('post.*')
                     ->where($where)
                     ->paginate($perPage);
             }
 
         }
         return $this->post
-            ->join('post_data', 'post_data.post_id', '=', 'post.id')
-            ->select('post.*', DB::raw("IF (post.id = {$id},1,0) as sort"))
+            ->select('*', DB::raw("IF (id = {$id},1,0) as sort"))
             ->where($where)
             ->where(function($query) use ($request){
                 if(isset($request['topic_id']) && $request['topic_id']){
-                    $query->whereRaw('FIND_IN_SET('.$request['topic_id'].', post.topic_ids)');
+                    $query->whereRaw('FIND_IN_SET('.$request['topic_id'].', topic_ids)');
                 }
             })
             ->orderBy('sort', 'desc')
@@ -464,7 +458,6 @@ class PostRepositories
             $order = 'post_share.updated_at';
         }
         return $post
-            ->join('post_data', 'post_data.post_id', '=', 'post.id')
             ->select('post.*')
             ->where($where)
             ->orderBy($order,'desc')
@@ -477,8 +470,6 @@ class PostRepositories
     public function detail($id)
     {
         return $this->post
-            ->join('post_data', 'post_data.post_id', '=', 'post.id')
-            ->select('post.*')
             ->find($id);
     }
 
@@ -498,8 +489,6 @@ class PostRepositories
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
 
         return $this->post
-            ->join('post_data', 'post_data.post_id', '=', 'post.id')
-            ->select('post.*')
             ->orderBy('is_suggest','desc')
             ->orderBy('weight','desc')
             ->paginate($perPage);
@@ -513,9 +502,7 @@ class PostRepositories
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
 
         return $this->post
-            ->join('post_data', 'post_data.post_id', '=', 'post.id')
-            ->select('post.*')
-            ->whereRaw('FIND_IN_SET(' . $request['id'] . ',post.topic_ids)')
+            ->whereRaw('FIND_IN_SET(' . $request['id'] . ',topic_ids)')
             ->orderBy('id','desc')
             ->paginate($perPage);
     }