diff --git a/src/controllers/03-employee-controller.ts b/src/controllers/03-employee-controller.ts index 9345b8d..70ad1da 100644 --- a/src/controllers/03-employee-controller.ts +++ b/src/controllers/03-employee-controller.ts @@ -231,12 +231,8 @@ export class EmployeeController extends Controller { prisma.employee.findMany({ orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }], include: { - employeePassport: { - orderBy: { expireDate: "desc" }, - }, - employeeVisa: { - orderBy: { expireDate: "desc" }, - }, + employeePassport: passport ? { orderBy: { expireDate: "desc" } } : undefined, + employeeVisa: visa ? { orderBy: { expireDate: "desc" } } : undefined, province: true, district: true, subDistrict: true,