คอมเม้นผู้บังคับบัญชา

src/controllers/KpiPlanController.ts

@@ -22,6 +22,7 @@ import HttpStatusCode from "../interfaces/http-status";
 import { KpiPlan, createKpiPlan, updateKpiPlan } from "../entities/kpiPlan";
 import CallAPI from "../interfaces/call-api";
 import { KpiPeriod } from "../entities/kpiPeriod";
+import { Brackets } from "typeorm";
 
 @Route("api/v1/kpi/plan")
 @Tags("kpiPlan")
@@ -320,6 +321,14 @@ export class kpiPlanController extends Controller {
           kpiPeriodId: kpiPeriodId,
         },
       )
+      .andWhere(
+        new Brackets((qb) => {
+          qb.orWhere("kpiPlan.including LIKE :keyword", { keyword: `%${keyword}%` }).orWhere(
+            "kpiPlan.includingName LIKE :keyword",
+            { keyword: `%${keyword}%` },
+          );
+        }),
+      )
       .select([
         "kpiPlan.id",
         "kpiPeriod.year",