From 8287e4e3c19c1343f852587b1337bbb4ee848908 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 2 Oct 2025 16:14:03 +0700
Subject: [PATCH] fix bug registry retire

---
 src/modules/04_registryPerson/views/listRetire.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/modules/04_registryPerson/views/listRetire.vue b/src/modules/04_registryPerson/views/listRetire.vue
index 032f48464..cede603d8 100644
--- a/src/modules/04_registryPerson/views/listRetire.vue
+++ b/src/modules/04_registryPerson/views/listRetire.vue
@@ -113,12 +113,10 @@ async function fetchDataPerson() {
     queryParams.isProbation = store.formFilter.isProbation;
   }
 
-  if (store.formFilter.isShowRetire != null) {
-    queryParams.isRetire = store.formFilter.isShowRetire;
-    queryParams.retireType = queryParams.isRetire
-      ? store.formFilter.retireType
-      : undefined;
-  }
+  queryParams.isRetire = true;
+  queryParams.retireType = queryParams.isRetire
+    ? store.formFilter.retireType
+    : undefined;
 
   if (empType.value !== "officer") {
     queryParams.type = empType.value;
@@ -220,7 +218,6 @@ function onclickSearch() {
  * @param item ประเภทข้าราชการ
  */
 function selectType() {
-  store.formFilter.isShowRetire = false;
   store.labelOption.retireType = "ทั้งหมด";
   store.formFilter.retireType = null;
   store.formFilter.keyword = "";
@@ -251,7 +248,6 @@ function selectType() {
       store.formFilter.keyword != "" ||
       store.labelOption.posType != "ทั้งหมด" ||
       store.labelOption.posLevel != "ทั้งหมด" ||
-      store.formFilter.isShowRetire ||
       store.formFilter.isProbation ||
       store.formFilter.nodeId != null ||
       store.formFilter.dateAppoint != ""