diff --git a/src/controllers/KpiUserDevelopmentController.ts b/src/controllers/KpiUserDevelopmentController.ts index 6f93da2..a1b8a5e 100644 --- a/src/controllers/KpiUserDevelopmentController.ts +++ b/src/controllers/KpiUserDevelopmentController.ts @@ -337,6 +337,7 @@ export class KpiUserDevelopmentController extends Controller { // evaluating?: boolean | null; }, ) { + const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""]; const [kpiUserDevelopment, total] = await AppDataSource.getRepository(KpiUserDevelopment) .createQueryBuilder("kpiUserDevelopment") .leftJoinAndSelect("kpiUserDevelopment.kpiUserEvaluation", "kpiUserEvaluation") @@ -370,7 +371,11 @@ export class KpiUserDevelopmentController extends Controller { }) .orWhere("kpiUserDevelopment.name LIKE :keyword", { keyword: `%${requestBody.keyword}%`, - }); + }) + .orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, { + firstName: `%${firstName}%`, + }) + .orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` }); }), ) .orderBy("kpiUserDevelopment.createdAt", "ASC")