Merge branch 'main' of ssh://hrms-git.chin.in.th:6611/BMA-HRMS/hrms-api-org

# Conflicts: # src/controllers/ReportController.ts
2025-03-06 00:09:24 +07:00 · 2025-03-06 00:09:24 +07:00 · 22828d9dcf
commit 22828d9dcf
parent b80ed12f8e 09826cd9a9
1 changed files with 3 additions and 3 deletions
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@ -378,9 +378,9 @@ export class ReportController extends Controller {
          currentPosition: null,
          lengthPosition: null,
          positionDate: {
-            Years: x.Years,
-            Months: x.Months,
-            Days: x.Days,
+            Years: x.Years ? x.Years : 0,
+            Months: x.Months ? x.Months : 0,
+            Days: x.Days ? x.Days : 0,
          },
          levelDate: {
            posExecutiveYears: x.levelYears,