diff --git a/src/modules/02_organizationalNew/store/organizational.ts b/src/modules/02_organizationalNew/store/organizational.ts index 096f392ca..bef3684f9 100644 --- a/src/modules/02_organizationalNew/store/organizational.ts +++ b/src/modules/02_organizationalNew/store/organizational.ts @@ -76,9 +76,9 @@ export const useOrganizational = defineStore("organizationalStore", () => { : "ว่าง", posMasterNo: e.orgShortname + - e.posMasterNoPrefix + - e.posMasterNo + - e.posMasterNoSuffix, + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + + (e.posMasterNo?e.posMasterNo:"") + + (e.posMasterNoSuffix?e.posMasterNoSuffix:""), positionName: e.isSit ? e.profilePosition : e.positionName, posTypeName: e.isSit ? e.profilePostype : e.posTypeName, posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName, diff --git a/src/modules/16_positionEmployee/store/organizational.ts b/src/modules/16_positionEmployee/store/organizational.ts index 702078fc0..3db85426f 100644 --- a/src/modules/16_positionEmployee/store/organizational.ts +++ b/src/modules/16_positionEmployee/store/organizational.ts @@ -72,9 +72,9 @@ export const usePositionEmp = defineStore("positionEmpStore", () => { : "ว่าง", posMasterNo: e.orgShortname + - e.posMasterNoPrefix + - e.posMasterNo + - e.posMasterNoSuffix, + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + + (e.posMasterNo ? e.posMasterNo : "") + + (e.posMasterNoSuffix ? e.posMasterNoSuffix : ""), positionName: e.isSit ? e.profilePosition : e.positionName, posTypeName: e.isSit ? e.profilePostype : e.posTypeName, posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName,