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

ดัก posType, posLevel มีค่า null

Browse source
This commit is contained in:
Bright 2024-04-04 11:31:42 +07:00
parent 6ab68394a5
commit d3ecbf3bd1
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/DevelopmentHistoryController.ts
View file

@ -192,7 +192,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
.leftJoinAndSelect("developmentHistory.development", "development")
.leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
.leftJoinAndSelect("developmentHistory.posType", "posType")
.andWhere(year != 0 || year != null || year != undefined ? "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(
new Brackets((qb) => {
@ -266,14 +266,13 @@ export class DevelopmentOfficerHistoryController extends Controller {
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
const formattedData = development.map(item => ({
id: item.id,
citizenId: item.citizenId,
fullName: item.prefix+item.firstName+" "+item.lastName,
position: item.position,
posType: item.posType.posTypeName,
posLevel: item.posLevel.posLevelName,
posType: item.posType ? item.posType.posTypeName : null,
posLevel: item.posLevel ? item.posLevel.posLevelName : null,
posExecutive: item.posExecutive,
projectName: item.development.projectName,
}));