From 7550ea729bdd822680652b7beadf0c5f968656a6 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 18 Apr 2024 17:49:34 +0700
Subject: [PATCH] fix

---
 src/controllers/KpiEvaluationController.ts | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/controllers/KpiEvaluationController.ts b/src/controllers/KpiEvaluationController.ts
index 057b6f7..bb263a0 100644
--- a/src/controllers/KpiEvaluationController.ts
+++ b/src/controllers/KpiEvaluationController.ts
@@ -70,23 +70,27 @@ async updateKpiEvaluations(
    */
   @Get()
   async listKpiEvaluation(
-    @Query("page") page: number = 1,
-    @Query("pageSize") pageSize: number = 10,
-    @Query("keyword") keyword?: string,
+    // @Query("page") page: number = 1,
+    // @Query("pageSize") pageSize: number = 10,
+    // @Query("keyword") keyword?: string,
   ) {
     let whereClause: any = {};
 
-    if (keyword !== undefined && keyword !== "") {
-      whereClause = {
-        where: [{ description: Like(`%${keyword}%`) }],
-      };
-      whereClause.where.push({ level: Like(`%${keyword}%`) });
+    // if (keyword !== undefined && keyword !== "") {
+    //   whereClause = {
+    //     where: [{ description: Like(`%${keyword}%`) }],
+    //   };
+    //   whereClause.where.push({ level: Like(`%${keyword}%`) });
 
-    }
+    // }
     
-    const [kpiEvaluation, total] = await this.kpiEvaluationRepository.findAndCount({
-      ...whereClause,
-      ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }),
+    // const [kpiEvaluation, total] = await this.kpiEvaluationRepository.findAndCount({
+    //   ...whereClause,
+    //   ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }),
+    //   order:{
+    //     level: "DESC"}
+    // });
+    const kpiEvaluation = await this.kpiEvaluationRepository.find({
       order:{
         level: "DESC"}
     });
@@ -96,6 +100,6 @@ async updateKpiEvaluations(
       level: item.level,
       description: item.description
     }));
-    return new HttpSuccess({ data: formatted, total });
+    return new HttpSuccess(formatted);
   }
 }