This commit is contained in:
Default
2025-04-19 16:50:08 +08:00
parent aafd25260a
commit 4299706868
7 changed files with 300 additions and 216 deletions

View File

@@ -168,7 +168,7 @@ class ChapterService
$strCacheKey = '';
$intLifeTime = 0;
if (empty($arrFilter['$and'])) {
$arrFilter = [];
}
@@ -188,7 +188,7 @@ class ChapterService
$intLifeTime = $intLifeTime;
}
$arrNovel = $this->ChapterModel->findPaginatedWithCache(
$arrChapter = $this->ChapterModel->findPaginatedWithCache(
$arrFilter,
$intPage,
$intLimit,
@@ -197,10 +197,14 @@ class ChapterService
$intLifeTime,
);
$arrPager = call_user_func([$this, $Func], $arrParams, $arrSort, $arrNovel);
$arrPager = call_user_func([$this, $Func], $arrParams, $arrSort, $arrChapter);
$arrPager = $arrChapter;
unset($arrPager['data']);
$arrPager['pager'] = call_user_func([$this, $Func], $arrParams, $arrSort, $arrChapter);
$arrResult = [
'data' => $arrNovel['data'],
'data' => $arrChapter['data'],
'p_data' => $arrPager,
];
@@ -218,7 +222,7 @@ class ChapterService
{
// 小说详情
$arrNovel = $this->NovelModel->getNovelByNId($intNId);
// 章节
$ChapterModel = ChapterModel::getInstance();
$arrFilter = ['n_id' => $intNId, 'c_sort_num' => $intCSortNum, 'c_page' => $intCPage];

View File

@@ -416,8 +416,8 @@ class NovelService
}
}
# n_category_sex_zh filter
if (!empty($strNSex)) {
# key filter
if (!empty($strKey)) {
$strKey = mb_substr($strKey, 0, 30);
$arrFilter['$and'][] = [
@@ -468,7 +468,11 @@ class NovelService
$intLifeTime = $intLifeTime;
}
if (empty($arrFilter['$and'])) {
$arrFilter = [];
}
$arrNovel = $this->NovelModel->findPaginatedWithCache(
$arrFilter,
$intPage,
@@ -478,11 +482,12 @@ class NovelService
$intLifeTime,
);
$arrPager = call_user_func([$this, $Func], $arrParams, $arrSort, $arrNovel);
$arrPager = $arrNovel;
unset($arrPager['data']);
$arrPager['pager'] = call_user_func([$this, $Func], $arrParams, $arrSort, $arrNovel);
$arrResult = [
'data' => $arrNovel['data'] ?? [],
'pages' => $arrNovel['pages'] ?? 0,
'data' => $arrNovel['data'],
'p_data' => $arrPager,
];