From 810e782a390021305026163927171e82ea4c7a75 Mon Sep 17 00:00:00 2001 From: Adisak Date: Tue, 28 Oct 2025 10:22:45 +0700 Subject: [PATCH] fix --- src/controllers/KpiCapacityController.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/controllers/KpiCapacityController.ts b/src/controllers/KpiCapacityController.ts index 7fc7146..ab7c9ca 100644 --- a/src/controllers/KpiCapacityController.ts +++ b/src/controllers/KpiCapacityController.ts @@ -438,11 +438,11 @@ export class kpiCapacityController extends Controller { async listKpiCapacity( @Request() request: RequestWithUser, @Query("page") page: number = 1, - @Query("pageSize") pageSize: number = 10, + @Query("pageSize") pageSize?: number, @Query("type") type?: string, @Query("keyword") keyword?: string, ) { - const [kpiCapacity, total] = await AppDataSource.getRepository(KpiCapacity) + let query = await AppDataSource.getRepository(KpiCapacity) .createQueryBuilder("kpiCapacity") .leftJoinAndSelect("kpiCapacity.kpiCapacityDetails", "kpiCapacityDetail") .andWhere( @@ -452,8 +452,13 @@ export class kpiCapacityController extends Controller { ) .andWhere(type == undefined ? "1=1" : { type: type }) .orderBy("kpiCapacity.createdAt", "ASC") - .skip((page - 1) * pageSize) - .take(pageSize) + + if (pageSize) { + query = query.skip((page - 1) * pageSize) + .take(pageSize) + } + + const [kpiCapacity, total] = await query .getManyAndCount(); const mapFormula = kpiCapacity.map((item) => ({