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

Merge branch 'adiDev' into develop

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-21 15:40:46 +07:00
commit 6ba5764fbb
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -238,12 +238,7 @@ export class DevelopmentEmployeeHistoryController extends Controller {
: "1=1", : "1=1",
{ year: body.year }, { year: body.year },
) )
.andWhere( .andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", { root: body.root })
body.root != null && body.root != undefined ? "developmentHistory.root = :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) => {

7
src/controllers/DevelopmentHistoryController.ts
View file

@ -230,9 +230,9 @@ 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(body.root != null && body.root != undefined ? "development.root = :root" : "1=1", {
root: body.root, // 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(
@ -313,6 +313,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
fullName: item.prefix + item.firstName + " " + item.lastName, fullName: item.prefix + item.firstName + " " + item.lastName,
position: item.position, position: item.position,
year: item.development.year, year: item.development.year,
root: item.development.root,//test
posType: item.posType ? item.posType.posTypeName : null, posType: item.posType ? item.posType.posTypeName : null,
posLevel: item.posLevel ? item.posLevel.posLevelName : null, posLevel: item.posLevel ? item.posLevel.posLevelName : null,
posExecutive: item.posExecutive, posExecutive: item.posExecutive,