diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index c17017e95..34030c278 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -57,6 +57,7 @@ export default {
 
   /**ครองตำแหน่ง */
   orgSearchProfile: `${orgProfile}/search`,
+  orgSearchCurrentProfile: `${orgProfile}/search/current/person`,
   orgProfile: `${orgPos}/profile`,
   orgDeleteProfile: (id: string) => `${orgPos}/profile/delete/${id}`,
   orgSummary: `${orgPos}/summary`,
diff --git a/src/modules/02_organization/components/DialogSelectPerson.vue b/src/modules/02_organization/components/DialogSelectPerson.vue
index eeec6be61..9b12586a9 100644
--- a/src/modules/02_organization/components/DialogSelectPerson.vue
+++ b/src/modules/02_organization/components/DialogSelectPerson.vue
@@ -330,7 +330,12 @@ function searchData() {
     keyword: formData.personal, //นามสกุล ชื่อ สกุล เลขบัตร
   };
   http
-    .post(config.API.orgSearchProfile, reqBody)
+    .post(
+      store.typeOrganizational === "draft"
+        ? config.API.orgSearchProfile
+        : config.API.orgSearchCurrentProfile,
+      reqBody
+    )
     .then((res) => {
       totalPage.value = Math.ceil(res.data.result.total / pageSize.value);
       const list = res.data.result.data.map((e: SelectPerson) => ({
@@ -450,7 +455,7 @@ watch(
 <template>
   <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 80vw">
-      <form @submit.prevent="validateForm">
+      <q-form greedy @submit.prevent @validation-success="validateForm">
         <DialogHeader :tittle="`เลือกคนครอง`" :close="close" />
         <q-separator />
 
@@ -564,6 +569,7 @@ watch(
                       label="ค้นหาจากชื่อ-นามสกุล หรือเลขประจำตัวประชาชน"
                       lazy-rules
                       hide-bottom-space
+                      @keydown.enter.prevent="searchData"
                     />
                   </div>
                   <div class="col-2">
@@ -577,6 +583,7 @@ watch(
                       label="ตำแหน่งในสายงาน"
                       lazy-rules
                       hide-bottom-space
+                      @keydown.enter.prevent="searchData"
                     />
                   </div>
                   <div class="col-2">
@@ -650,7 +657,6 @@ watch(
                     map-options
                     :options="columnsResult"
                     option-value="name"
-                    
                     style="min-width: 140px"
                     class="col-xs-12 col-sm-3 col-md-2"
                   />
@@ -746,7 +752,7 @@ watch(
         <q-card-actions align="right" class="bg-white text-teal">
           <q-btn type="submit" :label="`ยืนยัน`" color="public" />
         </q-card-actions>
-      </form>
+      </q-form>
     </q-card>
   </q-dialog>
 </template>
diff --git a/src/modules/04_registryPerson/views/edit/list.vue b/src/modules/04_registryPerson/views/edit/list.vue
index 0a813703b..38292b777 100644
--- a/src/modules/04_registryPerson/views/edit/list.vue
+++ b/src/modules/04_registryPerson/views/edit/list.vue
@@ -462,7 +462,7 @@ onMounted(async () => {
           <q-tr
             :props="props"
             class="cursor-pointer"
-            @click.stop,pervent="
+            @click.stop.prevent="
               onRedirectToPosition(props.row.id, props.row.type)
             "
           >
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index ca8ae7706..8180cbd86 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -687,7 +687,7 @@ function onViewDetailNoti(url: string) {
                     dense
                     icon="mdi-close"
                     class="mybtn q-mx-xs"
-                    @click.stop.pervent="clickDelete(n.id, index)"
+                    @click.stop.prevent="clickDelete(n.id, index)"
                   ></q-btn>
                 </q-item>
               </div>