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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
kittapath 2025-03-10 12:54:26 +07:00
commit efee15eb97
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/controllers/ReportController.ts
View file

@ -319,11 +319,11 @@ export class ReportController extends Controller {
(i: any) => i.isHigh === true (i: any) => i.isHigh === true
) )
: [] : []
if(_educations.length == 0) { // if(_educations.length == 0) {
_educations = Array.isArray(x.Educations) && x.Educations != null // _educations = Array.isArray(x.Educations) && x.Educations != null
? (x.Educations as any[])[0] // ? (x.Educations as any[])[0]
: [] // : []
} // }
} }
} }
else { else {
@ -370,10 +370,10 @@ export class ReportController extends Controller {
dateRetire: x.dateRetire, dateRetire: x.dateRetire,
dateRetireLaw: x.dateRetireLaw, dateRetireLaw: x.dateRetireLaw,
birthdate: x.birthdate, birthdate: x.birthdate,
education: _educations, Educations: _educations,
degree: x.degrees, // degree: x.degrees,
educationLevel: x.educationLevels, // educationLevel: x.educationLevels,
field: x.fields, // field: x.fields,
age: x.age, age: x.age,
currentPosition: null, currentPosition: null,
lengthPosition: null, lengthPosition: null,
@ -602,11 +602,11 @@ export class ReportController extends Controller {
(i: any) => i.isHigh === true (i: any) => i.isHigh === true
) )
: [] : []
if(_educations.length == 0) { // if(_educations.length == 0) {
_educations = Array.isArray(x.Educations) && x.Educations != null // _educations = Array.isArray(x.Educations) && x.Educations != null
? (x.Educations as any[])[0] // ? (x.Educations as any[])[0]
: [] // : []
} // }
} }
} }
else { else {
@ -651,10 +651,10 @@ export class ReportController extends Controller {
dateRetire: x.dateRetire, dateRetire: x.dateRetire,
dateRetireLaw: x.dateRetireLaw, dateRetireLaw: x.dateRetireLaw,
birthdate: x.birthdate, birthdate: x.birthdate,
education: _educations, Educations: _educations != null ? _educations : [],
degree: x.degrees, // degree: x.degrees,
educationLevel: x.educationLevels, // educationLevel: x.educationLevels,
field: x.fields, // field: x.fields,
age: x.age, age: x.age,
currentPosition: null, currentPosition: null,
lengthPosition: null, lengthPosition: null,