เพิ่มฟิว API

src/controllers/KpiUserEvaluationController.ts

@@ -250,6 +250,18 @@ export class KpiUserEvaluationController extends Controller {
             })
             .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}%`,
             });
         }),
       )
@@ -258,7 +270,14 @@ export class KpiUserEvaluationController extends Controller {
       .take(requestBody.pageSize)
       .getManyAndCount();
 
-    const mapData = kpiUserEvaluation.map((item) => ({
+    const mapData = kpiUserEvaluation.map((item) => {
+      const fullNameParts = [item.child4, item.child3, item.child2, item.child1, item.org];
+
+      const organization = fullNameParts
+        .filter((part) => part !== undefined && part !== null)
+        .join("/");
+
+      return {
         id: item.id,
         profileId: item.profileId,
         prefix: item.prefix,
@@ -271,7 +290,16 @@ export class KpiUserEvaluationController extends Controller {
         evaluatorId: item.evaluatorId,
         commanderId: item.commanderId,
         commanderHighId: item.commanderHighId,
-    }));
+        root: item.org,
+        rootId: item.orgId,
+        position: item.position,
+        // posTypeId: item.posTypeId,
+        posTypeName: item.posTypeName,
+        // posLevelId: item.posLevelId,
+        posLevelName: item.posLevelName,
+        organization: organization,
+      };
+    });
     return new HttpSuccess({ data: mapData, total });
   }