diff --git a/src/controllers/PermissionProfileController.ts b/src/controllers/PermissionProfileController.ts
index 67a8e815..99e4cb47 100644
--- a/src/controllers/PermissionProfileController.ts
+++ b/src/controllers/PermissionProfileController.ts
@@ -65,7 +65,8 @@ export class PermissionProfileController extends Controller {
 
       if (!request.user.role.includes("SUPER_ADMIN")) {
         rootId =
-          orgRevisionActive?.posMasters?.filter((x) => x.current_holderId == profile.id)[0]
+          orgRevisionActive?.posMasters?.filter((x) => x.next_holderId == profile.id)[0]
+            // orgRevisionActive?.posMasters?.filter((x) => x.current_holderId == profile.id)[0]
             ?.orgRootId || null;
         if (!rootId) return new HttpSuccess([]);
       }
@@ -165,59 +166,59 @@ export class PermissionProfileController extends Controller {
           _data.current_holders.length == 0
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
-                  null
+              _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+              null
               ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
               : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                  _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                    ?.orgChild3 != null
+                _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                  ?.orgChild3 != null
                 ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                 : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                    _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                      ?.orgChild2 != null
+                  _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                    ?.orgChild2 != null
                   ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                   : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                      _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                        ?.orgChild1 != null
+                    _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                      ?.orgChild1 != null
                     ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                     : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-                          null &&
-                        _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                          ?.orgRoot != null
+                      null &&
+                      _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                        ?.orgRoot != null
                       ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                       : null;
         const root =
           _data.current_holders.length == 0 ||
-          (_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
+            (_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+              _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
 
         const child1 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1;
 
         const child2 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2;
 
         const child3 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3;
 
         const child4 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
 
@@ -363,78 +364,78 @@ export class PermissionProfileController extends Controller {
           _data.profileTree.current_holders.length == 0
             ? null
             : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-                  null &&
-                _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                  ?.orgChild4 != null
+              null &&
+              _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                ?.orgChild4 != null
               ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
               : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-                    null &&
-                  _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                    ?.orgChild3 != null
+                null &&
+                _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                  ?.orgChild3 != null
                 ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                 : _data.profileTree.current_holders.find(
-                      (x) => x.orgRevisionId == findRevision.id,
-                    ) != null &&
-                    _data.profileTree.current_holders.find(
-                      (x) => x.orgRevisionId == findRevision.id,
-                    )?.orgChild2 != null
+                  (x) => x.orgRevisionId == findRevision.id,
+                ) != null &&
+                  _data.profileTree.current_holders.find(
+                    (x) => x.orgRevisionId == findRevision.id,
+                  )?.orgChild2 != null
                   ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                   : _data.profileTree.current_holders.find(
-                        (x) => x.orgRevisionId == findRevision.id,
-                      ) != null &&
-                      _data.profileTree.current_holders.find(
-                        (x) => x.orgRevisionId == findRevision.id,
-                      )?.orgChild1 != null
+                    (x) => x.orgRevisionId == findRevision.id,
+                  ) != null &&
+                    _data.profileTree.current_holders.find(
+                      (x) => x.orgRevisionId == findRevision.id,
+                    )?.orgChild1 != null
                     ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                     : _data.profileTree.current_holders.find(
-                          (x) => x.orgRevisionId == findRevision.id,
-                        ) != null &&
-                        _data.profileTree.current_holders.find(
-                          (x) => x.orgRevisionId == findRevision.id,
-                        )?.orgRoot != null
+                      (x) => x.orgRevisionId == findRevision.id,
+                    ) != null &&
+                      _data.profileTree.current_holders.find(
+                        (x) => x.orgRevisionId == findRevision.id,
+                      )?.orgRoot != null
                       ? `${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                       : null;
         const root =
           _data.profileTree.current_holders.length == 0 ||
-          (_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-            null &&
-            _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-              ?.orgRoot == null)
+            (_data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
+              null &&
+              _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                ?.orgRoot == null)
             ? null
             : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                ?.orgRoot;
+              ?.orgRoot;
 
         const child1 =
           _data.profileTree.current_holders == null ||
-          _data.profileTree.current_holders.length == 0 ||
-          _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.profileTree.current_holders.length == 0 ||
+            _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                ?.orgChild1;
+              ?.orgChild1;
 
         const child2 =
           _data.profileTree.current_holders == null ||
-          _data.profileTree.current_holders.length == 0 ||
-          _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.profileTree.current_holders.length == 0 ||
+            _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                ?.orgChild2;
+              ?.orgChild2;
 
         const child3 =
           _data.profileTree.current_holders == null ||
-          _data.profileTree.current_holders.length == 0 ||
-          _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.profileTree.current_holders.length == 0 ||
+            _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                ?.orgChild3;
+              ?.orgChild3;
 
         const child4 =
           _data.profileTree.current_holders == null ||
-          _data.profileTree.current_holders.length == 0 ||
-          _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.profileTree.current_holders.length == 0 ||
+            _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.profileTree.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                ?.orgChild4;
+              ?.orgChild4;
 
         let _root = root?.orgRootName;
         let _child1 = child1?.orgChild1Name;
diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index a56d4f9f..02880d8c 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -492,14 +492,14 @@ async function handler_command_noti(msg: amqp.ConsumeMessage): Promise<boolean>
     let profilesSend =
       command && command.commandSends.length > 0
         ? command.commandSends
-            .filter((x: any) => x.profileId != null)
-            .map((x: any) => ({
-              receiverUserId: x.profileId,
-              notiLink: "",
-              isSendMail: x.commandSendCCs.map((x: any) => x.name == "EMAIL").length > 0,
-              isSendInbox: x.commandSendCCs.map((x: any) => x.name == "INBOX").length > 0,
-              isSendNotification: true,
-            }))
+          .filter((x: any) => x.profileId != null)
+          .map((x: any) => ({
+            receiverUserId: x.profileId,
+            notiLink: "",
+            isSendMail: x.commandSendCCs.map((x: any) => x.name == "EMAIL").length > 0,
+            isSendInbox: x.commandSendCCs.map((x: any) => x.name == "INBOX").length > 0,
+            isSendNotification: true,
+          }))
         : [];
     const payloadStr = await PayloadSendNoti(command.id);
     const profilesSendRequest = new CallAPI()
@@ -1719,23 +1719,23 @@ async function clearMenuAndRoleCache(): Promise<void> {
       console.log(`[AMQ] Cleared ${roleKeys.length} role cache keys`);
     }
 
-    const posMasterKeys = await keysAsync("posMaster_*");
-    if (posMasterKeys.length > 0) {
-      await delAsync(...posMasterKeys);
-      console.log(`[AMQ] Cleared ${posMasterKeys.length} posMaster cache keys`);
-    }
+    // const posMasterKeys = await keysAsync("posMaster_*");
+    // if (posMasterKeys.length > 0) {
+    //   await delAsync(...posMasterKeys);
+    //   console.log(`[AMQ] Cleared ${posMasterKeys.length} posMaster cache keys`);
+    // }
 
-    const userKeys = await keysAsync("user_*");
-    if (userKeys.length > 0) {
-      await delAsync(...userKeys);
-      console.log(`[AMQ] Cleared ${userKeys.length} user cache keys`);
-    }
+    // const userKeys = await keysAsync("user_*");
+    // if (userKeys.length > 0) {
+    //   await delAsync(...userKeys);
+    //   console.log(`[AMQ] Cleared ${userKeys.length} user cache keys`);
+    // }
 
-    const orgKeys = await keysAsync("org_*");
-    if (orgKeys.length > 0) {
-      await delAsync(...orgKeys);
-      console.log(`[AMQ] Cleared ${orgKeys.length} org cache keys`);
-    }
+    // const orgKeys = await keysAsync("org_*");
+    // if (orgKeys.length > 0) {
+    //   await delAsync(...orgKeys);
+    //   console.log(`[AMQ] Cleared ${orgKeys.length} org cache keys`);
+    // }
   } finally {
     redisClient.quit();
   }