diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index c788935..acf78a6 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -25,24 +25,24 @@ export const useLeaveStore = defineStore("Leave", () => {
 	}
 	const DataMainUpdate = ref<formListLeaveData[]>([]) // ข้อมูลเปลี่ยนแปลง
 	const DataMain = (val: formListLeaveData[]) => (DataMainOrig.value = val)
-	const DataUpdate = (filterType: string, filterStatus: string, filterYear: number | null) => {
+	const DataUpdate = (filterType: string, filterStatus: string, filterYear: string) => {
 		DataMainUpdate.value = []
 
-		if (filterType === "" && filterStatus === "" && filterYear === 0) {
+		if (filterType === "" && filterStatus === "" && filterYear === "") {
 			DataMainUpdate.value = DataMainOrig.value
-		} else if (filterType !== "" && filterStatus === "" && filterYear === 0) {
+		} else if (filterType !== "" && filterStatus === "" && filterYear === "") {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.Type === filterType)
 		} else if (filterType !== "" && filterStatus !== "" && filterYear === null) {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.Type === filterType && item.Status === filterStatus)
-		} else if (filterType !== "" && filterStatus === "" && filterYear !== 0) {
+		} else if (filterType !== "" && filterStatus === "" && filterYear !== "") {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.Type === filterType && item.fiscalYear === filterYear)
-		} else if (filterType === "" && filterStatus !== "" && filterYear === 0) {
+		} else if (filterType === "" && filterStatus !== "" && filterYear === "") {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.Status === filterStatus)
-		} else if (filterType === "" && filterStatus === "" && filterYear !== 0) {
+		} else if (filterType === "" && filterStatus === "" && filterYear !== "") {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.fiscalYear === filterYear)
 		} else if (filterType === "" && filterStatus !== "" && filterYear !== null) {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.Status === filterStatus && item.fiscalYear === filterYear)
-		} else if (filterType !== "" && filterStatus !== "" && filterYear === 0) {
+		} else if (filterType !== "" && filterStatus !== "" && filterYear === "") {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.Status === filterStatus && item.Type === filterType)
 		} else if (filterType !== "" && filterStatus !== "" && filterYear !== null) {
 			DataMainUpdate.value = DataMainOrig.value.filter((item: formListLeaveData) => item.Type === filterType && item.Status === filterStatus && item.fiscalYear === filterYear)