Compare commits
1 Commits
fcd4ad3d1e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b5a79272e |
Generated
+17034
File diff suppressed because it is too large
Load Diff
@@ -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');
|
||||||
|
|
||||||
qb.skip(offset).take(pageSize);
|
// 分页(导出时取消分页,返回全部数据)
|
||||||
|
if (!query.isExport) {
|
||||||
|
qb.skip(offset).take(pageSize);
|
||||||
|
}
|
||||||
|
|
||||||
const [list, total] = await qb.getManyAndCount();
|
const [list, total] = await qb.getManyAndCount();
|
||||||
|
|
||||||
|
|||||||
@@ -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');
|
||||||
|
|
||||||
// 分页
|
// 分页(导出时取消分页,返回全部数据)
|
||||||
qb.skip(offset).take(pageSize);
|
if (!query.isExport) {
|
||||||
|
qb.skip(offset).take(pageSize);
|
||||||
|
}
|
||||||
|
|
||||||
// 4. 执行查询
|
// 4. 执行查询
|
||||||
const [list, total] = await qb.getManyAndCount();
|
const [list, total] = await qb.getManyAndCount();
|
||||||
|
|||||||
Reference in New Issue
Block a user