diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organizationalNew/components/DialogSortPosition.vue index 0ac3e8b5b..1598b91df 100644 --- a/src/modules/02_organizationalNew/components/DialogSortPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogSortPosition.vue @@ -81,7 +81,11 @@ function getData() { const dataList = res.data.result.data; const dataMap = dataList.map((item: any) => ({ id: item.id, - name: `${item.orgShortname}${item.posMasterNoPrefix}${item.posMasterNo}${item.posMasterNoSuffix}`, + name: `${item.orgShortname}${ + item.posMasterNoPrefix ? item.posMasterNoPrefix : "" + }${item.posMasterNo ? item.posMasterNo : ""}${ + item.posMasterNoSuffix ? item.posMasterNoSuffix : "" + }`, posMasterNoPrefix: item.posMasterNoPrefix, posMasterNo: item.posMasterNo, posMasterNoSuffix: item.posMasterNoSuffix, diff --git a/src/modules/16_positionEmployee/components/DialogSortPosition.vue b/src/modules/16_positionEmployee/components/DialogSortPosition.vue index aecaebf4a..fa8a75626 100644 --- a/src/modules/16_positionEmployee/components/DialogSortPosition.vue +++ b/src/modules/16_positionEmployee/components/DialogSortPosition.vue @@ -81,7 +81,11 @@ function getData() { const dataList = res.data.result.data; const dataMap = dataList.map((item: any) => ({ id: item.id, - name: `${item.orgShortname}${item.posMasterNoPrefix}${item.posMasterNo}${item.posMasterNoSuffix}`, + name: `${item.orgShortname}${ + item.posMasterNoPrefix ? item.posMasterNoPrefix : "" + }${item.posMasterNo ? item.posMasterNo : ""}${ + item.posMasterNoSuffix ? item.posMasterNoSuffix : "" + }`, posMasterNoPrefix: item.posMasterNoPrefix, posMasterNo: item.posMasterNo, posMasterNoSuffix: item.posMasterNoSuffix,