diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index c332bb26..ba670b3a 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -222,23 +222,23 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
       // ) {
       //หา dna tree
       const orgRoot = await orgRootRepository.find({
-        where: { orgRevisionId: orgRevisionDraft.id },
+        where: { orgRevisionId: orgRevisionPublish.id },
       });
 
       const orgChild1 = await child1Repository.find({
-        where: { orgRevisionId: orgRevisionDraft.id },
+        where: { orgRevisionId: orgRevisionPublish.id },
       });
 
       const orgChild2 = await child2Repository.find({
-        where: { orgRevisionId: orgRevisionDraft.id },
+        where: { orgRevisionId: orgRevisionPublish.id },
       });
 
       const orgChild3 = await child3Repository.find({
-        where: { orgRevisionId: orgRevisionDraft.id },
+        where: { orgRevisionId: orgRevisionPublish.id },
       });
 
       const orgChild4 = await child4Repository.find({
-        where: { orgRevisionId: orgRevisionDraft.id },
+        where: { orgRevisionId: orgRevisionPublish.id },
       });
 
       //หา dna posmaster ถ้าไม่มีให้เอาตัวเองเป็น dna