diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index 5af4ebf..6d6dadc 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -238,7 +238,12 @@ export class DevelopmentEmployeeHistoryController extends Controller { : "1=1", { 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( new Brackets((qb) => { diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index 8ba2d90..cee2aee 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -230,9 +230,12 @@ export class DevelopmentOfficerHistoryController extends Controller { : "1=1", { year: body.year }, ) - .andWhere(body.root != null && body.root != undefined ? "development.root = :root" : "1=1", { - root: body.root, - }) + .andWhere( + 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("developmentHistory.type = :type", { type: type }) .andWhere(