admin/SEONexus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.bgbg.live:18150/root/SEONexus into dev

Browse Source
This commit is contained in:
make
2025-04-19 11:56:39 +08:00
parent 4eca70d6e1 224e9d4b23
commit 6b44e134c0
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/app/services/ChapterService.php
View File

@@ -168,6 +168,10 @@ class ChapterService
$strCacheKey = ''; $strCacheKey = '';
$intLifeTime = 0; $intLifeTime = 0;
if (empty($arrFilter['$and'])) {
$arrFilter = [];
}
# cache filter # cache filter
if ($intCacheLifeTime > 0) { if ($intCacheLifeTime > 0) {

10
code/app/services/NovelService.php
View File

@@ -417,7 +417,7 @@ class NovelService
} }
# n_category_sex_zh filter # n_category_sex_zh filter
if (!empty($strNSex)) { if (!empty($strKey)) {
$strKey = mb_substr($strKey, 0, 30); $strKey = mb_substr($strKey, 0, 30);
$arrFilter['$and'][] = [ $arrFilter['$and'][] = [
@@ -454,6 +454,10 @@ class NovelService
$strCacheKey = ''; $strCacheKey = '';
$intLifeTime = 0; $intLifeTime = 0;
if (empty($arrFilter['$and'])) {
$arrFilter = [];
}
# cache filter # cache filter
if ($intCacheLifeTime > 0) { if ($intCacheLifeTime > 0) {
$strCacheKey = sprintf( $strCacheKey = sprintf(
@@ -468,7 +472,7 @@ class NovelService
$intLifeTime = $intLifeTime; $intLifeTime = $intLifeTime;
} }
$arrNovel = $this->NovelModel->findPaginatedWithCache( $arrNovel = $this->NovelModel->findPaginatedWithCache(
$arrFilter, $arrFilter,
$intPage, $intPage,
@@ -479,7 +483,7 @@ class NovelService
); );
$arrPager = call_user_func([$this, $Func], $arrParams, $arrSort, $arrNovel); $arrPager = call_user_func([$this, $Func], $arrParams, $arrSort, $arrNovel);
// TODO 如果所有筛选条件是 all ， 目前是返回数据是空的，应该要返回数据
$arrResult = [ $arrResult = [
'data' => $arrNovel['data'] ?? [], 'data' => $arrNovel['data'] ?? [],
'pages' => $arrNovel['pages'] ?? 0, 'pages' => $arrNovel['pages'] ?? 0,