ปรับออกคำสั่งลงตำแหน่ง

2025-02-21 19:10:27 +07:00 · 2025-02-21 19:10:27 +07:00 · e305ea7a88
commit e305ea7a88
parent c5e0fcc4f7
20 changed files with 1317 additions and 1183 deletions
--- a/src/controllers/DPISController.ts
+++ b/src/controllers/DPISController.ts
@ -258,7 +258,7 @@ export class DPISController extends Controller {
      //relations: ["current_holders", "current_holders.orgRoot"],
      order: {
        profileSalary: {
-          date: "DESC",
+          commandDateAffect: "DESC",
        },
        profileLeaves: {
          dateLeaveStart: "ASC",
@ -314,7 +314,7 @@ export class DPISController extends Controller {
      salaries: profile.profileSalary.map((item) => {
        return {
          posNo: item.posNo,
-          position: item.position,
+          position: item.positionName,
          positionType: item.positionType,
          positionLevel: item.positionLevel,
          amount: item.amount,