From 2aea50a5d4045674fe0ccb0e4c4959b33899c433 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Fri, 16 Aug 2024 12:08:10 +0700 Subject: [PATCH] fix find fullName --- src/controllers/KpiUserDevelopmentController.ts | 10 +++++----- src/controllers/KpiUserEvaluationController.ts | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/controllers/KpiUserDevelopmentController.ts b/src/controllers/KpiUserDevelopmentController.ts index a1b8a5e..fca466a 100644 --- a/src/controllers/KpiUserDevelopmentController.ts +++ b/src/controllers/KpiUserDevelopmentController.ts @@ -337,7 +337,8 @@ export class KpiUserDevelopmentController extends Controller { // evaluating?: boolean | null; }, ) { - const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""]; + let conditionFullName = + "CONCAT(kpiUserEvaluation.prefix, kpiUserEvaluation.firstName, ' ', kpiUserEvaluation.lastName) LIKE :keyword"; const [kpiUserDevelopment, total] = await AppDataSource.getRepository(KpiUserDevelopment) .createQueryBuilder("kpiUserDevelopment") .leftJoinAndSelect("kpiUserDevelopment.kpiUserEvaluation", "kpiUserEvaluation") @@ -372,10 +373,9 @@ 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}%` }); + .orWhere(conditionFullName, { + keyword: `%${requestBody.keyword}%`, + }); }), ) .orderBy("kpiUserDevelopment.createdAt", "ASC") diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts index 79fe3b2..9ecb374 100644 --- a/src/controllers/KpiUserEvaluationController.ts +++ b/src/controllers/KpiUserEvaluationController.ts @@ -215,7 +215,8 @@ export class KpiUserEvaluationController extends Controller { evaluating?: boolean | null; }, ) { - const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""]; + let conditionFullName = + "CONCAT(kpiUserEvaluation.prefix, kpiUserEvaluation.firstName, ' ', kpiUserEvaluation.lastName) LIKE :keyword"; const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation) .createQueryBuilder("kpiUserEvaluation") .andWhere(requestBody.kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", { @@ -266,10 +267,9 @@ export class KpiUserEvaluationController extends Controller { .orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", { keyword: `%${requestBody.keyword}%`, }) - .orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, { - firstName: `%${firstName}%`, + .orWhere(conditionFullName, { + keyword: `%${requestBody.keyword}%`, }) - .orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` }); }), ) .orderBy("kpiUserEvaluation.createdAt", "ASC")