Merge branch 'develop'

sdfsky · Jan 17, 2020 · 915d6fe · 915d6fe
2 parents b064f00 + 8f2fa61
commit 915d6fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/Http/Controllers/Ask/QuestionController.php b/app/Http/Controllers/Ask/QuestionController.php
@@ -314,6 +314,9 @@ public function suggest(Request $request)
             if (!$question) {
                 continue;
             }
+            if($question->status == 0){
+                continue;
+            }
             $suggestList .= '<li>';
 
             if ($question->status === 2) {

diff --git a/app/Models/Article.php b/app/Models/Article.php
@@ -65,7 +65,7 @@ public static function boot()
     /*获取相关文章*/
     public static function correlations($tagIds,$size=6)
     {
-        $questions = self::whereHas('tags', function($query) use ($tagIds) {
+        $questions = self::where("status",">",0)->whereHas('tags', function($query) use ($tagIds) {
             $query->whereIn('tag_id', $tagIds);
         })->orderBy('created_at','DESC')->take($size)->get();
         return $questions;

diff --git a/app/Models/Question.php b/app/Models/Question.php
@@ -93,7 +93,7 @@ public function getImagesAttribute($value)
     /*获取相关问题*/
     public static function correlations($tagIds, $size = 6)
     {
-        $questions = self::whereHas('tags', function ($query) use ($tagIds) {
+        $questions = self::where("status",">",0)->whereHas('tags', function ($query) use ($tagIds) {
             $query->whereIn('tag_id', $tagIds);
         })->orderBy('created_at', 'DESC')->take($size)->get();
         return $questions;