diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts
index ae36d4e..2b1f386 100644
--- a/src/controllers/DevelopmentEmployeeHistoryController.ts
+++ b/src/controllers/DevelopmentEmployeeHistoryController.ts
@@ -196,7 +196,7 @@ export class DevelopmentEmployeeHistoryController extends Controller {
       .leftJoinAndSelect("developmentHistory.development", "development")
       .leftJoinAndSelect("developmentHistory.employeePosLevel", "employeePosLevel")
       .leftJoinAndSelect("developmentHistory.employeePosType", "employeePosType")
-      .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) => {
@@ -276,8 +276,8 @@ export class DevelopmentEmployeeHistoryController extends Controller {
       citizenId: item.citizenId,
       fullName: item.prefix+item.firstName+" "+item.lastName,
       position: item.position,
-      posType: item.employeePosType.posTypeName,
-      posLevel: item.employeePosLevel.posLevelName,
+      posType: item.employeePosType ? item.employeePosType.posTypeName : null,
+      posLevel: item.employeePosLevel ? item.employeePosLevel.posLevelName : null,
       projectName: item.development.projectName,
     }));
 
diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts
index 429b4c2..f00ad71 100644
--- a/src/controllers/DevelopmentHistoryController.ts
+++ b/src/controllers/DevelopmentHistoryController.ts
@@ -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,
     }));