hrms-bangkok/hrms-api-salary
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-30 15:21:58 +07:00
commit bd38181be1
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/SalaryPeriodController.ts
View file

@ -1584,7 +1584,7 @@ export class SalaryPeriodController extends Controller {
// : `profile.isRetired = false`
// : "1=1",
body.isRetire == null
? `profile.isRetired = false`
? "1=1"
: body.isRetire == "1"
? `profile.isRetired = true`
: body.isRetire == "0"

22
src/controllers/SalaryPeriodEmployeeController.ts
View file

@ -1099,11 +1099,18 @@ export class SalaryPeriodEmployeeController extends Controller {
type: body.type == null ? "" : `${body.type.toUpperCase()}`,
})
.andWhere(
body.isRetire != null
? body.isRetire == "1"
// body.isRetire != null
// ? body.isRetire == "1"
// ? `profile.isRetired = true`
// : `profile.isRetired = false`
// : "1=1",
body.isRetire == null
? "1=1"
: body.isRetire == "1"
? `profile.isRetired = true`
: `profile.isRetired = false`
: "1=1",
: body.isRetire == "0"
? `profile.isRetired = false`
: "1=1",
)
.andWhere({
salaryOrgId: salaryOrg.id,
@ -1121,10 +1128,9 @@ export class SalaryPeriodEmployeeController extends Controller {
.orWhere("profile.prefix LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.firstName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.lastName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere(
"CONCAT(profile.posTypeShort,' ',profile.posLevel) LIKE :keyword",
{ keyword: `%${body.keyword}%` },
)
.orWhere("CONCAT(profile.posTypeShort,' ',profile.posLevel) LIKE :keyword", {
keyword: `%${body.keyword}%`,
})
.orWhere(
"CONCAT(profile.prefix,profile.firstName,' ',profile.lastName) LIKE :keyword",
{ keyword: `%${body.keyword}%` },