From bae73b98961b0d0af64f7a39b520baf082ac0422 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 18 Jul 2025 16:10:55 +0700
Subject: [PATCH] #1648 , #1649 , #1650

---
 src/controllers/ReportController.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 0b6bf5a0..cedd3105 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -687,7 +687,7 @@ export class ReportController extends Controller {
         "posMasters.positions.posExecutive",
       ],
     });
-
+    const orgName = orgRootData[0].orgRootName??"";
     const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null;
     const orgChild1Data = await this.child1Repository.find({
       where: {
@@ -1285,8 +1285,8 @@ export class ReportController extends Controller {
         }
       }
     }
-
-    return new HttpSuccess({ template: "report1", reportName: "report1", data: { data } });
+    
+    return new HttpSuccess({ template: "report1", reportName: "report1", data: { org: orgName,data } });
   }
 
   /**
@@ -1338,7 +1338,7 @@ export class ReportController extends Controller {
         "posMasters.positions.posExecutive",
       ],
     });
-
+    const orgName = orgRootData[0].orgRootName??"";
     const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null;
     const orgChild1Data = await this.child1Repository.find({
       where: {
@@ -3459,7 +3459,7 @@ export class ReportController extends Controller {
     //   sendWebSocket(metaData);
     // })();
 
-    return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
+    return new HttpSuccess({ template: "report2", reportName: "report2", data: { org: orgName ,data } });
   }
 
   /**
@@ -5697,7 +5697,7 @@ export class ReportController extends Controller {
         "posMasters.positions.posExecutive",
       ],
     });
-
+    const orgName = orgRootData[0].orgRootName??"";
     const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null;
     const orgChild1Data = await this.child1Repository.find({
       where: {
@@ -6888,7 +6888,7 @@ export class ReportController extends Controller {
         }
       }
     }
-    return new HttpSuccess({ template: "report3", reportName: "report3", data: { data } });
+    return new HttpSuccess({ template: "report3", reportName: "report3", data: { org: orgName,data } });
   }
 
   @Get("report4/{rootId}")