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

Merge branch 'develop'

Browse source
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2024-12-25 23:40:20 +07:00
commit d0210fee2d
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/ReportController.ts
View file

@ -6890,12 +6890,13 @@ export class ReportController extends Controller {
qb.orWhere({ qb.orWhere({
salaryOrgId: In(salaryOrgs.map((x) => x.id)), salaryOrgId: In(salaryOrgs.map((x) => x.id)),
amountSpecial: MoreThan(0), amountSpecial: MoreThan(0),
type: Not("NONE"),
status: "PENDING", status: "PENDING",
}).orWhere({ })/*.orWhere({
salaryOrgId: In(salaryOrgs.map((x) => x.id)), salaryOrgId: In(salaryOrgs.map((x) => x.id)),
type: "NONE", type: "NONE",
status: "PENDING", status: "PENDING",
}); });*/
}), }),
) )
.andWhere( .andWhere(