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

ไม่พบข้อมูลเขต

Browse source
This commit is contained in:
Kittapath 2024-06-11 10:55:23 +07:00
parent aa67674fa7
commit 4564912b5b
6 changed files with 157 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/ProfileController.ts
View file

@ -1041,14 +1041,6 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.andWhere(
searchKeyword != undefined && searchKeyword != null && searchKeyword != ""
? queryLike
: "1=1",
{
keyword: `%${searchKeyword}%`,
},
)
.andWhere(
posType != undefined && posType != null && posType != ""
? "posType.posTypeName LIKE :keyword1"
@ -1077,6 +1069,14 @@ export class ProfileController extends Controller {
: `profile.dateRetire IS NOT NULL`
: "1=1",
)
.andWhere(
searchKeyword != undefined && searchKeyword != null && searchKeyword != ""
? queryLike
: "1=1",
{
keyword: `%${searchKeyword}%`,
},
)
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();