peihaoyu/TaoLer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复热帖delete_time

Browse Source
This commit is contained in:
taoser 2024-04-14 12:10:25 +08:00
parent a8943fa6aa
commit 06cc3caf77
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/common/model/Article.php
View File

@ -116,7 +116,7 @@ class Article extends Model
->where('id', 'in', $topIdArr) ->where('id', 'in', $topIdArr)
->with([ ->with([
'cate' => function (Query $query) { 'cate' => function (Query $query) {
$query->where('delete_time', 0)->field('id,catename,ename'); $query->field('id,catename,ename');
}, },
'user' => function (Query $query) { 'user' => function (Query $query) {
$query->field('id,name,nickname,user_img'); $query->field('id,name,nickname,user_img');
@ -143,7 +143,7 @@ class Article extends Model
$data = $this::field('id,title,title_color,cate_id,user_id,content,create_time,is_hot,pv,jie,upzip,has_img,has_video,has_audio,read_type,art_pass') $data = $this::field('id,title,title_color,cate_id,user_id,content,create_time,is_hot,pv,jie,upzip,has_img,has_video,has_audio,read_type,art_pass')
->with([ ->with([
'cate' => function(Query $query){ 'cate' => function(Query $query){
$query->where('delete_time',0)->field('id,catename,ename,detpl'); $query->field('id,catename,ename,detpl');
}, },
'user' => function(Query $query){ 'user' => function(Query $query){
$query->field('id,name,nickname,user_img'); $query->field('id,name,nickname,user_img');
@ -173,8 +173,7 @@ class Article extends Model
{ {
return Cache::remember('article_hot', function() use($num){ return Cache::remember('article_hot', function() use($num){
$comments = Comment::field('article_id,count(*) as count') $comments = Comment::field('article_id,count(*) as count')
->where('comment.delete_time',0) ->hasWhere('article',['status' => 1])
->hasWhere('article',['status' =>1, 'delete_time' => 0])
->group('article_id') ->group('article_id')
->order('count','desc') ->order('count','desc')
->limit($num) ->limit($num)
@ -229,7 +228,7 @@ class Article extends Model
->where(['status'=>1]) ->where(['status'=>1])
->with([ ->with([
'cate' => function(Query $query){ 'cate' => function(Query $query){
$query->where('delete_time',0)->field('id,catename,ename'); $query->field('id,catename,ename');
}, },
'user' => function(Query $query){ 'user' => function(Query $query){
$query->field('id,name,nickname,user_img,area_id,vip,city')->withCount(['article','comments']); $query->field('id,name,nickname,user_img,area_id,vip,city')->withCount(['article','comments']);
@ -319,7 +318,7 @@ class Article extends Model
public function getUserArtList(int $id) { public function getUserArtList(int $id) {
$userArtList = $this::field('id,cate_id,title,create_time,pv,is_hot') $userArtList = $this::field('id,cate_id,title,create_time,pv,is_hot')
->with(['cate' => function($query){ ->with(['cate' => function($query){
$query->where(['delete_time'=>0,'status'=>1])->field('id,ename'); $query->where(['status'=>1])->field('id,ename');
}]) }])
->where(['user_id' => $id,'status' => 1]) ->where(['user_id' => $id,'status' => 1])
->order('id','desc') ->order('id','desc')
@ -368,7 +367,7 @@ class Article extends Model
->with(['user' => function($query){ ->with(['user' => function($query){
$query->field('id,name,nickname,user_img,area_id,vip'); $query->field('id,name,nickname,user_img,area_id,vip');
},'cate' => function($query){ },'cate' => function($query){
$query->where('delete_time',0)->field('id,catename,ename'); $query->field('id,catename,ename');
}]) }])
->where(['status'=>1]) ->where(['status'=>1])
->order('id desc') ->order('id desc')

2
config/taoler.php
View File

@ -16,7 +16,7 @@ return [
// 应用名,此项不可更改 // 应用名,此项不可更改
'appname' => 'TaoLer', 'appname' => 'TaoLer',
// 版本配置 // 版本配置
'version' => '2.5.6', 'version' => '2.5.7',
// 加盐 // 加盐
'salt' => 'taoler', 'salt' => 'taoler',
// 数据库备份目录 // 数据库备份目录

4
vendor/taoser/think-addons/src/helper.php vendored
View File

@ -25,7 +25,9 @@ spl_autoload_register(function ($class) {
$class = ltrim($class, '\\'); $class = ltrim($class, '\\');
$dir = App::getRootPath(); //$dir = App::getRootPath();
$root_path = str_replace('\\','/', dirname(__DIR__));
$dir = strstr($root_path, 'vendor', true);
$namespace = 'addons'; $namespace = 'addons';
if (strpos($class, $namespace) === 0) { if (strpos($class, $namespace) === 0) {