Merge branch 'main' of ssh://hrms-git.chin.in.th:6611/BMA-HRMS/hrms-api-org
# Conflicts: # src/controllers/ReportController.ts
This commit is contained in:
commit
22828d9dcf
1 changed files with 3 additions and 3 deletions
|
|
@ -378,9 +378,9 @@ export class ReportController extends Controller {
|
||||||
currentPosition: null,
|
currentPosition: null,
|
||||||
lengthPosition: null,
|
lengthPosition: null,
|
||||||
positionDate: {
|
positionDate: {
|
||||||
Years: x.Years,
|
Years: x.Years ? x.Years : 0,
|
||||||
Months: x.Months,
|
Months: x.Months ? x.Months : 0,
|
||||||
Days: x.Days,
|
Days: x.Days ? x.Days : 0,
|
||||||
},
|
},
|
||||||
levelDate: {
|
levelDate: {
|
||||||
posExecutiveYears: x.levelYears,
|
posExecutiveYears: x.levelYears,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue