diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index aaaa3dd7..e334351a 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -780,14 +780,20 @@ export class PositionController extends Controller { ...typeCondition, ...checkChildConditions, }, + skip: (body.page - 1) * body.pageSize, + take: body.pageSize, }); - if (!posMaster || posMaster.length === 0) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); - } + const total = posMaster.length; + + // if (!posMaster || posMaster.length === 0) { + // throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); + // } + const formattedData = await Promise.all( posMaster.map(async (posMaster) => { const positions = await this.positionRepository.find({ where: { posMasterId: posMaster.id }, + relations:["posLevel","posType","posExecutive"] }); return { @@ -813,7 +819,7 @@ export class PositionController extends Controller { }; }), ); - return new HttpSuccess(formattedData); + return new HttpSuccess({data:formattedData,total}); } catch (error) { return error; }