diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts
index 7c75e33..67b69b2 100644
--- a/src/controllers/KpiUserEvaluationController.ts
+++ b/src/controllers/KpiUserEvaluationController.ts
@@ -737,13 +737,23 @@ export class KpiUserEvaluationController extends Controller {
     @Query("keyword") keyword?: string,
     @Query("status") status?: string,
   ) {
+    let profileId: any = null;
+    await new CallAPI()
+      .GetData(request, "org/profile/keycloak/position")
+      .then((x) => {
+        profileId = x.profileId;
+      })
+      .catch((x) => {
+        throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลในทะเบียนประวัติ");
+      });
     const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
       .createQueryBuilder("kpiUserEvaluation")
       .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
       .andWhere(kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
         kpiPeriodId: kpiPeriodId,
       })
-      .andWhere({ createdUserId: request.user.sub })
+      // .andWhere({ createdUserId: request.user.sub })
+      .andWhere({ profileId : profileId })
       .andWhere(
         status == null || status == undefined ? "1=1" : "evaluationStatus LIKE :evaluationStatus",
         {