fix: page() 支持 isExport 参数,导出时取消分页返回全部数据

This commit is contained in:
Jony
2026-07-03 13:49:59 +08:00
parent fcd4ad3d1e
commit 1b5a79272e
3 changed files with 17042 additions and 3 deletions
+17034
View File
File diff suppressed because it is too large Load Diff
+3
View File
@@ -52,7 +52,10 @@ export class KnowledgeBookService extends BaseService {
const orderField = ['id', 'createTime', 'updateTime', 'name', 'year'].includes(order) ? order : 'id'; const orderField = ['id', 'createTime', 'updateTime', 'name', 'year'].includes(order) ? order : 'id';
qb.orderBy(`a.${orderField}`, allowedSort as 'ASC' | 'DESC'); qb.orderBy(`a.${orderField}`, allowedSort as 'ASC' | 'DESC');
// 分页(导出时取消分页,返回全部数据)
if (!query.isExport) {
qb.skip(offset).take(pageSize); qb.skip(offset).take(pageSize);
}
const [list, total] = await qb.getManyAndCount(); const [list, total] = await qb.getManyAndCount();
+3 -1
View File
@@ -84,8 +84,10 @@ export class KnowledgeFilmService extends BaseService {
const orderField = ['id', 'createTime', 'updateTime', 'name', 'year'].includes(order) ? order : 'id'; const orderField = ['id', 'createTime', 'updateTime', 'name', 'year'].includes(order) ? order : 'id';
qb.orderBy(`a.${orderField}`, allowedSort as 'ASC' | 'DESC'); qb.orderBy(`a.${orderField}`, allowedSort as 'ASC' | 'DESC');
// 分页 // 分页(导出时取消分页,返回全部数据)
if (!query.isExport) {
qb.skip(offset).take(pageSize); qb.skip(offset).take(pageSize);
}
// 4. 执行查询 // 4. 执行查询
const [list, total] = await qb.getManyAndCount(); const [list, total] = await qb.getManyAndCount();