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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
mamoss 2025-03-26 10:58:11 +07:00
commit 124d79dbee
1 changed files with 51 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/controllers/ProfileSalaryTempController.ts
View file

@ -176,6 +176,56 @@ export class ProfileSalaryTempController extends Controller {
searchKeyword != null && searchKeyword != "" searchKeyword != null && searchKeyword != ""
? `posLevel.posLevelName like '%${searchKeyword}%'` ? `posLevel.posLevelName like '%${searchKeyword}%'`
: "1=1", : "1=1",
)
.orWhere(
searchKeyword != null && searchKeyword != ""
? `CONCAT(
orgRoot.orgRootShortName,
current_holders.posMasterNo
) like '%${searchKeyword}%'`
: "1=1",
)
.orWhere(
searchKeyword != null && searchKeyword != ""
? `CONCAT(
orgRoot.orgRootShortName,
orgChild1.orgChild1ShortName,
current_holders.posMasterNo
) like '%${searchKeyword}%'`
: "1=1",
)
.orWhere(
searchKeyword != null && searchKeyword != ""
? `CONCAT(
orgRoot.orgRootShortName,
orgChild1.orgChild1ShortName,
orgChild2.orgChild2ShortName,
current_holders.posMasterNo
) like '%${searchKeyword}%'`
: "1=1",
)
.orWhere(
searchKeyword != null && searchKeyword != ""
? `CONCAT(
orgRoot.orgRootShortName,
orgChild1.orgChild1ShortName,
orgChild2.orgChild2ShortName,
orgChild3.orgChild3ShortName,
current_holders.posMasterNo
) like '%${searchKeyword}%'`
: "1=1",
)
.orWhere(
searchKeyword != null && searchKeyword != ""
? `CONCAT(
orgRoot.orgRootShortName,
orgChild1.orgChild1ShortName,
orgChild2.orgChild2ShortName,
orgChild3.orgChild3ShortName,
orgChild4.orgChild4ShortName,
current_holders.posMasterNo
) like '%${searchKeyword}%'`
: "1=1",
); );
}), }),
) )
@ -201,7 +251,7 @@ export class ProfileSalaryTempController extends Controller {
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();
const data = await Promise.all( const data = await Promise.all(
record.map((_data) => { record.map((_data) => {
const posExecutive = const posExecutive =