diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts index 3e00c96..9d0d6fd 100644 --- a/src/controllers/KpiUserEvaluationController.ts +++ b/src/controllers/KpiUserEvaluationController.ts @@ -99,6 +99,7 @@ export class KpiUserEvaluationController extends Controller { // } const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation) .createQueryBuilder("kpiUserEvaluation") + .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .andWhere( requestBody.kpiPeriodId ? "kpiUserEvaluation.kpiPeriodId LIKE :kpiPeriodId" : "1=1", { @@ -106,7 +107,7 @@ export class KpiUserEvaluationController extends Controller { }, ) .andWhere( - requestBody.year ? "kpiUserEvaluation.year LIKE :year" : "1=1", {year: requestBody.year}, + requestBody.year ? "kpiPeriod.year LIKE :year" : "1=1", {year: requestBody.year}, ) .andWhere( requestBody.status != null && requestBody.status != undefined