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

fix bug ระบบทดลองปฏิบัติหน้าที่ราชการ #863

Browse source
This commit is contained in:
Bright 2024-12-18 17:14:30 +07:00
parent ce86d800a7
commit 9d46cd2e78
3 changed files with 112 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/controllers/ProfileController.ts
View file

@ -1384,14 +1384,6 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.citizenId LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.position LIKE :keyword"
@ -1400,22 +1392,6 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`,
},
)
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirectorActing.posLevel LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirectorActing.posType LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.actFullName LIKE :keyword"
@ -1479,7 +1455,7 @@ export class ProfileController extends Controller {
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.citizenId LIKE :keyword"
? "viewDirector.position LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
@ -1487,28 +1463,12 @@ export class ProfileController extends Controller {
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.position LIKE :keyword"
? "viewDirector.actFullName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirector.posLevel LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
// .orWhere(
// body.keyword != null && body.keyword != ""
// ? "viewDirector.posType LIKE :keyword"
// : "1=1",
// {
// keyword: `%${body.keyword}%`,
// },
// )
.orWhere(
body.keyword != null && body.keyword != ""
? "CONCAT(viewDirector.posType, ' (', viewDirector.posLevel, ')') LIKE :keyword"