diff --git a/src/controllers/PermissionController.ts b/src/controllers/PermissionController.ts
index 840bd703..d848af38 100644
--- a/src/controllers/PermissionController.ts
+++ b/src/controllers/PermissionController.ts
@@ -34,6 +34,13 @@ export class PermissionController extends Controller {
 
   @Get("")
   public async getPermission(@Request() request: { user: Record<string, any> }) {
+    const orgRevision = await this.orgRevisionRepository.findOne({
+      select: ["id"],
+      where: { 
+          orgRevisionIsDraft: false,
+          orgRevisionIsCurrent: true,
+      },
+    });
     const redisClient = await this.redis.createClient({
       host: REDIS_HOST,
       port: REDIS_PORT,
@@ -64,10 +71,11 @@ export class PermissionController extends Controller {
           select: ["authRoleId"],
         where: {
           current_holderId: profile.id,
-          orgRevision: {
-            orgRevisionIsDraft: false,
-            orgRevisionIsCurrent: true,
-          },
+          // orgRevision: {
+          //   orgRevisionIsDraft: false,
+          //   orgRevisionIsCurrent: true,
+          // },
+          orgRevisionId: orgRevision?.id
         },
       });
       if (!posMaster) {
@@ -75,10 +83,11 @@ export class PermissionController extends Controller {
             select: ["authRoleId"],
           where: {
             current_holderId: profile.id,
-            orgRevision: {
-              orgRevisionIsDraft: false,
-              orgRevisionIsCurrent: true,
-            },
+            // orgRevision: {
+            //   orgRevisionIsDraft: false,
+            //   orgRevisionIsCurrent: true,
+            // },
+            orgRevisionId: orgRevision?.id
           },
         });
         if (!posMaster) {
@@ -292,6 +301,13 @@ export class PermissionController extends Controller {
 
   @Get("org")
   public async listAuthSysOrg(@Request() request: RequestWithUser) {
+    const orgRevision = await this.orgRevisionRepository.findOne({
+      select: ["id"],
+      where: { 
+          orgRevisionIsDraft: false,
+          orgRevisionIsCurrent: true,
+      },
+    });
     const redisClient = await this.redis.createClient({
       host: REDIS_HOST,
       port: REDIS_PORT,
@@ -322,10 +338,11 @@ export class PermissionController extends Controller {
       const posMaster = await this.posMasterRepository.findOne({
         where: {
           current_holderId: profile.id,
-          orgRevision: {
-            orgRevisionIsDraft: false,
-            orgRevisionIsCurrent: true,
-          },
+          // orgRevision: {
+          //   orgRevisionIsDraft: false,
+          //   orgRevisionIsCurrent: true,
+          // },
+          orgRevisionId: orgRevision?.id
         },
       });
       if (!posMaster) {
@@ -350,10 +367,11 @@ export class PermissionController extends Controller {
       const posMaster = await this.posMasterEmpRepository.findOne({
         where: {
           current_holderId: profile.id,
-          orgRevision: {
-            orgRevisionIsDraft: false,
-            orgRevisionIsCurrent: true,
-          },
+          // orgRevision: {
+          //   orgRevisionIsDraft: false,
+          //   orgRevisionIsCurrent: true,
+          // },
+          orgRevisionId: orgRevision?.id
         },
       });
       if (!posMaster) {
@@ -382,6 +400,13 @@ export class PermissionController extends Controller {
 
   @Get("user/{id}")
   public async listOrgUser(@Request() request: RequestWithUser, @Path() id: string) {
+    const orgRevision = await this.orgRevisionRepository.findOne({
+      select: ["id"],
+      where: { 
+          orgRevisionIsDraft: false,
+          orgRevisionIsCurrent: true,
+      },
+    });
     const redisClient = await this.redis.createClient({
       host: REDIS_HOST,
       port: REDIS_PORT,
@@ -412,10 +437,11 @@ export class PermissionController extends Controller {
       const posMaster = await this.posMasterRepository.findOne({
         where: {
           current_holderId: profile.id,
-          orgRevision: {
-            orgRevisionIsDraft: false,
-            orgRevisionIsCurrent: true,
-          },
+          // orgRevision: {
+          //   orgRevisionIsDraft: false,
+          //   orgRevisionIsCurrent: true,
+          // },
+          orgRevisionId: orgRevision?.id
         },
       });
       if (!posMaster) {
@@ -440,10 +466,11 @@ export class PermissionController extends Controller {
       const posMaster = await this.posMasterEmpRepository.findOne({
         where: {
           current_holderId: profile.id,
-          orgRevision: {
-            orgRevisionIsDraft: false,
-            orgRevisionIsCurrent: true,
-          },
+          // orgRevision: {
+          //   orgRevisionIsDraft: false,
+          //   orgRevisionIsCurrent: true,
+          // },
+          orgRevisionId: orgRevision?.id
         },
       });
       if (!posMaster) {