diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index ac850cb2..5670d395 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -4707,15 +4707,17 @@ export class CommandController extends Controller {
         if (!profile) {
           throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
         }
+        const orgRevision = await this.orgRevisionRepository.findOne({
+          where: { 
+            orgRevisionIsCurrent: true,
+            orgRevisionIsDraft: false
+          }
+        });
         const _posMaster = await this.employeePosMasterRepository.findOne({
-          where: {
-            orgRevision: {
-              orgRevisionIsCurrent: true,
-              orgRevisionIsDraft: false,
-            },
-            current_holderId: profile.id,
+          where: { 
+            orgRevisionId: orgRevision?.id,
+            current_holderId: profile.id
           },
-          order: { createdAt: "DESC" },
           relations: {
             orgRoot: true,
             orgChild1: true,