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

Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop

Browse source
This commit is contained in:
Kittapath 2024-03-07 17:40:34 +07:00
commit a06d22d8fa
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/SalaryPeriodController.ts
View file

@ -1056,7 +1056,7 @@ export class SalaryPeriodController extends Controller {
const amountFullType = await this.salaryProfileRepository.count({
where: {
salaryOrgId: salaryOrg.id,
salaryOrgId: salaryOrg?.id,
type: "FULL",
},
});
@ -1073,7 +1073,7 @@ export class SalaryPeriodController extends Controller {
.createQueryBuilder("salaryProfile")
.select("SUM(salaryProfile.amountUse)", "totalAmount")
.where({
salaryOrgId: salaryOrg.id,
salaryOrgId: salaryOrg?.id,
type: In(["HAFT", "FULL", "FULLHAFT"]),
})
.getRawOne();