diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index 9b4e1ef..7946ec2 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -102,10 +102,8 @@ export class RequestDataController extends Controller { customerBranch: { include: { customer: true }, }, - createdBy: true, }, }, - employee: true, }, take: pageSize, skip: (page - 1) * pageSize, @@ -125,9 +123,16 @@ export class RequestDataController extends Controller { quotation: { include: { customerBranch: { include: { customer: true } }, + createdBy: true, + }, + }, + employee: { + include: { + employeePassport: { + orderBy: { expireDate: "desc" }, + }, }, }, - employee: true, }, }); }