diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index 95d2ae4..0e8e115 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -2434,7 +2434,7 @@ export class DevelopmentController extends Controller { ? item.posLevel.posLevelName : null : item.employeePosLevel - ? item.employeePosLevel.posLevelName + ? `${item.employeePosType.posTypeShortName ?? ""} ${item.employeePosLevel.posLevelName ?? ""}` : null, posExecutive: item.posExecutive, org: item.org, diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index d9ff0eb..3f1183d 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -505,7 +505,7 @@ export class ReportController extends Controller { .andWhere(body.year != 0 && body.year != null ? "development.year = :year" : "1=1", { year: body.year, }) - .andWhere(body.root != null ? "development.root = :root" : "1=1", { + .andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", { root: body.root, }) .andWhere("developmentHistory.type = :type", { type: "EMPLOYEE" })