Compare commits

...

2 Commits

Author SHA1 Message Date
614a1b696f Merge branch 'dev' 2025-07-07 14:43:39 +08:00
6ef860f24f fix: nas帮助中心union子句因无limit情况排序错误问题 2025-07-07 14:40:56 +08:00
4 changed files with 12 additions and 4 deletions

View File

@@ -341,7 +341,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) {
if ($key == 0) continue;
$model->union(function($query) use($val, $limit) {
$model->union(function($query) use($key, $val, $limit) {
$query->name('article')->field([
'id',
'cid',
@@ -355,6 +355,8 @@ class TopsNas extends BaseController
if (!empty($limit)) {
$query->limit($limit);
}
// 嵌套子查询解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
});
}

View File

@@ -293,7 +293,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) {
if ($key == 0) continue;
$model->union(function($query) use($val, $limit) {
$model->union(function($query) use($key, $val, $limit) {
$query->name('article')->field([
'id',
'cid',
@@ -307,6 +307,8 @@ class TopsNas extends BaseController
if (!empty($limit)) {
$query->limit($limit);
}
// 嵌套子查询解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
});
}

View File

@@ -123,7 +123,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) {
if ($key == 0) continue;
$model->union(function ($query) use ($val, $limit) {
$model->union(function ($query) use ($key, $val, $limit) {
$query->name('article')->field([
'id',
'cid',
@@ -137,6 +137,8 @@ class TopsNas extends BaseController
if (!empty($limit)) {
$query->limit($limit);
}
// 嵌套子查询解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
});
}

View File

@@ -184,7 +184,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) {
if ($key == 0) continue;
$model->union(function ($query) use ($val, $limit) {
$model->union(function ($query) use ($key, $val, $limit) {
$query->name('article')->field([
'id',
'cid',
@@ -198,6 +198,8 @@ class TopsNas extends BaseController
if (!empty($limit)) {
$query->limit($limit);
}
// 嵌套子查询解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
});
}