hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-17 10:22:13 +07:00
commit 33a5915bc1
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/ReportController.ts
View file

@ -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