Merge branch 'develop' into adiDev

src/controllers/ReportController.ts

@@ -385,7 +385,6 @@ export class ReportController extends Controller {
         },
       });
     }
-
     return new HttpSuccess({
       data: mapData,
       total: total,
@@ -5604,7 +5603,15 @@ export class ReportController extends Controller {
         }
       }
     }
-    return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
+    
+    return new HttpSuccess({ 
+      template: "report2", 
+      reportName: "report2", 
+      data: { 
+        rootName: orgRootData.length > 0 ? orgRootData[0].orgRootName : "-", 
+        data: data 
+      } 
+    });
   }
   /**
    * API Report3