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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-04-18 14:51:24 +07:00
commit afc42b743e
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -238,7 +238,12 @@ export class DevelopmentEmployeeHistoryController extends Controller {
: "1=1", : "1=1",
{ year: body.year }, { year: body.year },
) )
.andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", { root: body.root }) .andWhere(
body.root != null && body.root != undefined ? "developmentHistory.rootId = :root" : "1=1",
{
root: body.root,
},
)
.andWhere("developmentHistory.type = :type", { type: type }) .andWhere("developmentHistory.type = :type", { type: type })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {

9
src/controllers/DevelopmentHistoryController.ts
View file

@ -230,9 +230,12 @@ export class DevelopmentOfficerHistoryController extends Controller {
: "1=1", : "1=1",
{ year: body.year }, { year: body.year },
) )
.andWhere(body.root != null && body.root != undefined ? "development.root = :root" : "1=1", { .andWhere(
root: body.root, body.root != null && body.root != undefined ? "development.rootId = :root" : "1=1",
}) {
root: body.root,
},
)
.andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", { root: body.root }) .andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", { root: body.root })
.andWhere("developmentHistory.type = :type", { type: type }) .andWhere("developmentHistory.type = :type", { type: type })
.andWhere( .andWhere(