diff --git a/src/controllers/PermissionProfileController.ts b/src/controllers/PermissionProfileController.ts
index 9f565828..67a8e815 100644
--- a/src/controllers/PermissionProfileController.ts
+++ b/src/controllers/PermissionProfileController.ts
@@ -65,7 +65,7 @@ export class PermissionProfileController extends Controller {
 
       if (!request.user.role.includes("SUPER_ADMIN")) {
         rootId =
-          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([]);
       }
diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index c00b8150..a56d4f9f 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -1718,6 +1718,24 @@ async function clearMenuAndRoleCache(): Promise<void> {
       await delAsync(...roleKeys);
       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 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`);
+    }
   } finally {
     redisClient.quit();
   }