From ae7537a62a2ee45b03c75cdc11c848336e5a8fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Thu, 2 Feb 2023 14:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Article.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/api/controller/Article.php b/app/api/controller/Article.php
index aa635d8..4cf728f 100644
--- a/app/api/controller/Article.php
+++ b/app/api/controller/Article.php
@@ -76,7 +76,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
+                ->join(['fa_article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')
                 ->select()->toArray();
@@ -87,7 +87,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
+                ->join(['fa_article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')->select()->toArray();
         }else{
@@ -658,11 +658,11 @@ class Article extends BaseController
             }
         }
         $yishi = Db::table('fa_article')->alias('a')->join(['fa_article_vote_side_tables' => 'b'],'a.id=b.article_id')->where($www)->where('a.category_id',162)->whereTime('b.end_time', '>', date('Y-m-d H:i:s'))->count();
-        $maodun = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id',147)->count();
-        $xiejiao = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 148)->count();
-        $saohei = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count();
-        $sos = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count();
-        $one_shuqiu = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count();
+        $maodun = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id',147)->count();
+        $xiejiao = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 148)->count();
+        $saohei = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count();
+        $sos = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count();
+        $one_shuqiu = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count();
         $select = [
             'yishi' => $yishi,
             'maodun' => $maodun,
@@ -738,7 +738,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
+                ->join(['fa_article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')
                 ->select()->toArray();
@@ -749,7 +749,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
+                ->join(['fa_article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')->select()->toArray();
         }else{