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

no message

Browse source
This commit is contained in:
Bright 2024-04-04 10:42:29 +07:00
parent 786f0d51c8
commit 6ab68394a5
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -196,7 +196,7 @@ export class DevelopmentEmployeeHistoryController extends Controller {
.leftJoinAndSelect("developmentHistory.development", "development") .leftJoinAndSelect("developmentHistory.development", "development")
.leftJoinAndSelect("developmentHistory.employeePosLevel", "employeePosLevel") .leftJoinAndSelect("developmentHistory.employeePosLevel", "employeePosLevel")
.leftJoinAndSelect("developmentHistory.employeePosType", "employeePosType") .leftJoinAndSelect("developmentHistory.employeePosType", "employeePosType")
.andWhere("development.year = :year", { year: year }) .andWhere(year != 0 || year != null || year != undefined ? "development.year = :year" : "1=1", { year: year })
.andWhere("developmentHistory.type = :type", { type: type }) .andWhere("developmentHistory.type = :type", { type: type })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {

3
src/controllers/DevelopmentHistoryController.ts
View file

@ -192,7 +192,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
.leftJoinAndSelect("developmentHistory.development", "development") .leftJoinAndSelect("developmentHistory.development", "development")
.leftJoinAndSelect("developmentHistory.posLevel", "posLevel") .leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
.leftJoinAndSelect("developmentHistory.posType", "posType") .leftJoinAndSelect("developmentHistory.posType", "posType")
.andWhere(year != 0 || year != null ? "development.year = :year" : "1=1", { year: year }) .andWhere(year != 0 || year != null || year != undefined ? "development.year = :year" : "1=1", { year: year })
.andWhere("developmentHistory.type = :type", { type: type }) .andWhere("developmentHistory.type = :type", { type: type })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
@ -274,6 +274,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
position: item.position, position: item.position,
posType: item.posType.posTypeName, posType: item.posType.posTypeName,
posLevel: item.posLevel.posLevelName, posLevel: item.posLevel.posLevelName,
posExecutive: item.posExecutive,
projectName: item.development.projectName, projectName: item.development.projectName,
})); }));