Merge branch 'develop' into dev

fix
2026-07-03 17:00:57 +07:00 · 2026-07-03 17:00:30 +07:00
1 changed files with 6 additions and 6 deletions
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@ -9198,8 +9198,8 @@ export class ReportController extends Controller {
      return null; // refId ที่ไม่พบ salary → กรองออก (เหมือนเดิมที่ข้ามไป)
    }),
  );
-  return result.filter(Boolean); // return array ของ salary data ให้ org ทำงานต่อ
-  }
+  return { result: result.filter(Boolean) }; // return array ของ salary data ให้ org ทำงานต่อ
+  } 

  /**
   * API ออกคำสั่ง C-PM-34
@ -9330,7 +9330,7 @@ async SalaryReportExcecute34(
      return null;
    }),
  );
-  return result.filter(Boolean);
+  return { result: result.filter(Boolean) };
 }

  /**
@ -9463,7 +9463,7 @@ async SalaryReportExcecute34(
      return null;
    }),
  );
-  return result.filter(Boolean);
+  return { result: result.filter(Boolean) };
  }

  /**
@ -9607,7 +9607,7 @@ async SalaryReportExcecute34(
      return null;
    }),
  );
-  return result.filter(Boolean);
+  return { result: result.filter(Boolean) };
  }

  /**
@ -9749,7 +9749,7 @@ async SalaryReportExcecute34(
      return null;
    }),
  );
-  return result.filter(Boolean);
+  return { result: result.filter(Boolean) };
  }

  /**
Author	SHA1	Message	Date
harid	932a283d7c	Merge branch 'develop' into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 57s Details	2026-07-03 17:00:57 +07:00
harid	89ffb6bfe7	fix	2026-07-03 17:00:30 +07:00