fix org_053

This commit is contained in:
AdisakKanthawilang 2024-02-01 13:28:46 +07:00
parent 9e14637ed6
commit b78d0618b4

View file

@ -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;
}