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

รายการประวัติการฝึกอบรมลูกจ้าง & ระดับชั้นงานลูกจ้าง

Browse source
This commit is contained in:
Bright 2025-04-10 15:04:17 +07:00
parent cd6ef27116
commit 719da25875
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/DevelopmentController.ts
View file

@ -2434,7 +2434,7 @@ export class DevelopmentController extends Controller {
? item.posLevel.posLevelName ? item.posLevel.posLevelName
: null : null
: item.employeePosLevel : item.employeePosLevel
? item.employeePosLevel.posLevelName ? `${item.employeePosType.posTypeShortName ?? ""} ${item.employeePosLevel.posLevelName ?? ""}`
: null, : null,
posExecutive: item.posExecutive, posExecutive: item.posExecutive,
org: item.org, org: item.org,

2
src/controllers/ReportController.ts
View file

@ -505,7 +505,7 @@ export class ReportController extends Controller {
.andWhere(body.year != 0 && body.year != null ? "development.year = :year" : "1=1", { .andWhere(body.year != 0 && body.year != null ? "development.year = :year" : "1=1", {
year: body.year, year: body.year,
}) })
.andWhere(body.root != null ? "development.root = :root" : "1=1", { .andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", {
root: body.root, root: body.root,
}) })
.andWhere("developmentHistory.type = :type", { type: "EMPLOYEE" }) .andWhere("developmentHistory.type = :type", { type: "EMPLOYEE" })