diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index f8f431bd..a2f4ad69 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -162,6 +162,7 @@ export class OrganizationController extends Controller {
         request: request.user,
         revision: revision,
       },
+      user: request.user,
     };
     try {
       await sendToQueueOrgDraft(msg);
diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index 017dd6cd..44b2e626 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -418,7 +418,6 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
     orgRevisionDraft.orgRevisionIsDraft = false;
     await repoOrgRevision.save(orgRevisionDraft);
   }
-
   const { data, token, user } = JSON.parse(msg.content.toString());
   const { id, status, lastUpdateUserId, lastUpdateFullName, lastUpdatedAt } = data;
   try {
@@ -1400,9 +1399,29 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
       }
     }
     console.log("[AMQ] Excecute Organization Success");
+    if (user) {
+      sendWebSocket(
+        "send-publish-org",
+        {
+          success: true,
+          message: `ระบบทำการเผยแพร่โครงสร้างหน่วยงานเรียบร้อยแล้ว`,
+        },
+        { userId: user?.sub },
+      ).catch(console.error);
+    }
     return true;
   } catch (error) {
     console.error(error);
+    if (user) {
+      sendWebSocket(
+        "send-publish-org",
+        {
+          success: false,
+          message: `ระบบทำการเผยแพร่โครงสร้างหน่วยงานไม่สำเร็จ`,
+        },
+        { userId: user?.sub },
+      ).catch(console.error);
+    }
     return false;
   }
 }
@@ -2097,9 +2116,29 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
     await orgRevisionRepository.remove(_orgRevisions);
 
     console.log("[AMQ] Create Draft Success");
+    if (user) {
+     await sendWebSocket(
+        "send-create-draft-org",
+        {
+          success: true,
+          message: `ระบบทำการสร้างแบบร่างโครงสร้างหน่วยงานเรียบร้อยแล้ว`,
+        },
+        { userId: user?.sub },
+      ).catch(console.error);
+    }
     return true;
   } catch (error) {
     console.error(error);
+    if (user) {
+      await sendWebSocket(
+        "send-create-draft-org",
+        {
+          success: false,
+          message: `ระบบทำการสร้างแบบร่างโครงสร้างหน่วยงานไม่สำเร็จ`,
+        },
+        { userId: user?.sub },
+      ).catch(console.error);
+    }
     return false;
   }
 }