diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts index 8e86152..79fe3b2 100644 --- a/src/controllers/KpiUserEvaluationController.ts +++ b/src/controllers/KpiUserEvaluationController.ts @@ -215,6 +215,7 @@ export class KpiUserEvaluationController extends Controller { evaluating?: boolean | null; }, ) { + const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""]; const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation) .createQueryBuilder("kpiUserEvaluation") .andWhere(requestBody.kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", { @@ -247,24 +248,28 @@ export class KpiUserEvaluationController extends Controller { qb.orWhere("kpiUserEvaluation.prefix LIKE :keyword", { keyword: `%${requestBody.keyword}%`, }) - .orWhere("kpiUserEvaluation.firstName LIKE :keyword", { - keyword: `%${requestBody.keyword}%`, - }) - .orWhere("kpiUserEvaluation.lastName LIKE :keyword", { - keyword: `%${requestBody.keyword}%`, - }) - .orWhere("kpiUserEvaluation.org LIKE :keyword", { - keyword: `%${requestBody.keyword}%`, - }) - .orWhere("kpiUserEvaluation.position LIKE :keyword", { - keyword: `%${requestBody.keyword}%`, - }) - .orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", { - keyword: `%${requestBody.keyword}%`, - }) - .orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", { - keyword: `%${requestBody.keyword}%`, - }); + .orWhere("kpiUserEvaluation.firstName LIKE :keyword", { + keyword: `%${requestBody.keyword}%`, + }) + .orWhere("kpiUserEvaluation.lastName LIKE :keyword", { + keyword: `%${requestBody.keyword}%`, + }) + .orWhere("kpiUserEvaluation.org LIKE :keyword", { + keyword: `%${requestBody.keyword}%`, + }) + .orWhere("kpiUserEvaluation.position LIKE :keyword", { + keyword: `%${requestBody.keyword}%`, + }) + .orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", { + keyword: `%${requestBody.keyword}%`, + }) + .orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", { + keyword: `%${requestBody.keyword}%`, + }) + .orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, { + firstName: `%${firstName}%`, + }) + .orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` }); }), ) .orderBy("kpiUserEvaluation.createdAt", "ASC")