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

fix find posType+posLevel

Browse source
This commit is contained in:
Bright 2024-12-02 10:18:22 +07:00
parent 40fe2d0b2c
commit bd745327ad
1 changed files with 54 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/controllers/ProfileController.ts
View file

@ -1400,22 +1400,22 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}, },
) )
.orWhere( // .orWhere(
body.keyword != null && body.keyword != "" // body.keyword != null && body.keyword != ""
? "viewDirectorActing.posLevel LIKE :keyword" // ? "viewDirectorActing.posLevel LIKE :keyword"
: "1=1", // : "1=1",
{ // {
keyword: `%${body.keyword}%`, // keyword: `%${body.keyword}%`,
}, // },
) // )
.orWhere( // .orWhere(
body.keyword != null && body.keyword != "" // body.keyword != null && body.keyword != ""
? "viewDirectorActing.posType LIKE :keyword" // ? "viewDirectorActing.posType LIKE :keyword"
: "1=1", // : "1=1",
{ // {
keyword: `%${body.keyword}%`, // keyword: `%${body.keyword}%`,
}, // },
) // )
.orWhere( .orWhere(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "viewDirectorActing.actFullName LIKE :keyword" ? "viewDirectorActing.actFullName LIKE :keyword"
@ -1423,6 +1423,22 @@ export class ProfileController extends Controller {
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}, },
)
.orWhere(
body.keyword != null && body.keyword != ""
? "CONCAT(viewDirectorActing.posType, ' (', viewDirectorActing.posLevel, ')') LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
)
.orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
); );
}), }),
) )
@ -1477,9 +1493,25 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`, 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( .orWhere(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "viewDirector.posLevel LIKE :keyword" ? "CONCAT(viewDirector.posType, ' (', viewDirector.posLevel, ')') LIKE :keyword"
: "1=1", : "1=1",
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
@ -1487,7 +1519,7 @@ export class ProfileController extends Controller {
) )
.orWhere( .orWhere(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "viewDirector.posType LIKE :keyword" ? "viewDirector.posNo LIKE :keyword"
: "1=1", : "1=1",
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,