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/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-11-29 14:16:40 +07:00
commit c690aaf871
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/controllers/WorkflowController.ts
View file

@ -907,6 +907,20 @@ export class WorkflowController extends Controller {
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}, },
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posExecutiveName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
); );
}), }),
) )
@ -959,6 +973,20 @@ export class WorkflowController extends Controller {
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}, },
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posExecutiveName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
); );
}), }),
) )