diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 3ef9e1bd..b025054f 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1651,16 +1651,27 @@ export class ProfileEmployeeController extends Controller {
         const shortName =
           _data.current_holders.length == 0
             ? null
-            : _data.current_holders[0].orgChild4 != null
-              ? `${_data.current_holders[0].orgChild4.orgChild4ShortName}${_data.current_holders[0].posMasterNo}`
-              : _data.current_holders[0].orgChild3 != null
-                ? `${_data.current_holders[0].orgChild3.orgChild3ShortName}${_data.current_holders[0].posMasterNo}`
-                : _data.current_holders[0].orgChild2 != null
-                  ? `${_data.current_holders[0].orgChild2.orgChild2ShortName}${_data.current_holders[0].posMasterNo}`
-                  : _data.current_holders[0].orgChild1 != null
-                    ? `${_data.current_holders[0].orgChild1.orgChild1ShortName}${_data.current_holders[0].posMasterNo}`
-                    : _data.current_holders[0].orgRoot != null
-                      ? `${_data.current_holders[0].orgRoot.orgRootShortName}${_data.current_holders[0].posMasterNo}`
+            : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+                  null
+              ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+              : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                  _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                    ?.orgChild3 != null
+                ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+                : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                    _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                      ?.orgChild2 != null
+                  ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+                  : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                      _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                        ?.orgChild1 != null
+                    ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+                    : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
+                          null &&
+                        _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                          ?.orgRoot != null
+                      ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                       : null;
         const dateEmployment =
           _data.profileEmployeeEmployment.length == 0
diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts
index f1c0bb87..377eec05 100644
--- a/src/controllers/ProfileEmployeeTempController.ts
+++ b/src/controllers/ProfileEmployeeTempController.ts
@@ -1403,6 +1403,12 @@ export class ProfileEmployeeTempController extends Controller {
       queryLike = "profileEmployee.position LIKE :keyword";
     }
     let _data = await new permission().PermissionList(request, "SYS_REGISTRY_TEMP");
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
+    if (!findRevision) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "not found. OrgRevision");
+    }
     const [record, total] = await this.profileRepo
       .createQueryBuilder("profileEmployee")
       .leftJoinAndSelect("profileEmployee.posLevel", "posLevel")
@@ -1502,16 +1508,27 @@ export class ProfileEmployeeTempController extends Controller {
         const shortName =
           _data.current_holders.length == 0
             ? null
-            : _data.current_holders[0].orgChild4 != null
-              ? `${_data.current_holders[0].orgChild4.orgChild4ShortName}${_data.current_holders[0].posMasterNo}`
-              : _data.current_holders[0].orgChild3 != null
-                ? `${_data.current_holders[0].orgChild3.orgChild3ShortName}${_data.current_holders[0].posMasterNo}`
-                : _data.current_holders[0].orgChild2 != null
-                  ? `${_data.current_holders[0].orgChild2.orgChild2ShortName}${_data.current_holders[0].posMasterNo}`
-                  : _data.current_holders[0].orgChild1 != null
-                    ? `${_data.current_holders[0].orgChild1.orgChild1ShortName}${_data.current_holders[0].posMasterNo}`
-                    : _data.current_holders[0].orgRoot != null
-                      ? `${_data.current_holders[0].orgRoot.orgRootShortName}${_data.current_holders[0].posMasterNo}`
+            : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+                  null
+              ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+              : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                  _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                    ?.orgChild3 != null
+                ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+                : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                    _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                      ?.orgChild2 != null
+                  ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+                  : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                      _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                        ?.orgChild1 != null
+                    ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+                    : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
+                          null &&
+                        _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                          ?.orgRoot != null
+                      ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName}${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                       : null;
         const dateEmployment =
           _data.profileEmployeeEmployment.length == 0