From 773a43c7f42e1360b51ac370e017ec4608518f3d Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Thu, 30 May 2024 16:05:00 +0700 Subject: [PATCH] fix --- src/controllers/ProfileController.ts | 2 +- src/controllers/ProfileEmployeeController.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 3bff75c8..88946386 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -2999,7 +2999,7 @@ export class ProfileController extends Controller { posTypeId: item.posType == null ? null : item.posType.id, posTypeName: item.posType == null ? null : item.posType.posTypeName, posTypeRank: item.posType == null ? null : item.posType.posTypeRank, - posNo: `${posMaster == null ? null : posMaster.posMasterNo}${shortName}`, + posNo: shortName, posMasterNo: posMaster == null ? null : posMaster.posMasterNo, position: item.position, posExecutiveId: posExecutiveId, diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 7e0fa9f3..855b8ba5 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2192,7 +2192,7 @@ export class ProfileEmployeeController extends Controller { posTypeId: item.posType == null ? null : item.posType.id, posTypeName: item.posType == null ? null : item.posType.posTypeName, posTypeRank: item.posType == null ? null : item.posType.posTypeRank, - posNo: `${posMaster == null ? null : posMaster.posMasterNo}${shortName}`, + posNo: shortName, posMasterNo: posMaster == null ? null : posMaster.posMasterNo, position: item.position, // posExecutiveId: posExecutiveId,