diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 4696f18a..a12a9c59 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -87,7 +87,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -178,10 +178,9 @@ const rules = reactive({
   configValue: [{ required: true, message: "请输入系统配置值", trigger: "blur" }],
 });
 
-// 查询系统配置
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   ConfigAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;
@@ -192,11 +191,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行复选框选中项变化
diff --git a/src/views/system/dict/dict-item.vue b/src/views/system/dict/dict-item.vue
index 71ace3df..dea401e0 100644
--- a/src/views/system/dict/dict-item.vue
+++ b/src/views/system/dict/dict-item.vue
@@ -18,8 +18,8 @@
           <div class="search-form-btn-box">
             <div class="search-form-btn-box-item">
               <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
               </el-form-item>
             </div>
           </div>
@@ -83,7 +83,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -173,8 +173,8 @@ const computedRules = computed(() => {
   return rules;
 });
 
-// 查询
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
   DictAPI.getDictItemPage(dictCode.value, queryParams)
     .then((data) => {
@@ -186,11 +186,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行选择
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index de498561..4ada8af8 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -14,8 +14,8 @@
         </el-form-item>
 
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -89,7 +89,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -172,10 +172,9 @@ const computedRules = computed(() => {
   return rules;
 });
 
-// 查询
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   DictAPI.getPage(queryParams)
     .then((data) => {
       tableData.value = data.list;
@@ -186,11 +185,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行选择
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 90ae693b..028040aa 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -56,7 +56,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
   </div>
@@ -85,10 +85,9 @@ const queryParams = reactive<LogPageQuery>({
 // 日志表格数据
 const pageData = ref<LogPageVO[]>();
 
-/** 查询 */
-function handleQuery() {
+/** 获取数据 */
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   LogAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;
@@ -98,12 +97,19 @@ function handleQuery() {
       loading.value = false;
     });
 }
+
+/** 查询（重置页码后获取数据） */
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 /** 重置查询 */
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   queryParams.createTime = undefined;
-  handleQuery();
+  fetchData();
 }
 
 onMounted(() => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ca331b3a..8697902b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -94,7 +94,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -277,10 +277,9 @@ const isExpanded = ref(true);
 
 const parentChildLinked = ref(true);
 
-// 查询
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   RoleAPI.getPage(queryParams)
     .then((data) => {
       roleList.value = data.list;
@@ -291,11 +290,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行复选框选中
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 87a077d4..ae943cbe 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -157,7 +157,7 @@
             v-model:total="total"
             v-model:page="queryParams.pageNum"
             v-model:limit="queryParams.pageSize"
-            @pagination="handleQuery"
+            @pagination="fetchData"
           />
         </el-card>
       </el-col>
@@ -313,18 +313,22 @@ const roleOptions = ref<OptionType[]>();
 // 导入弹窗显示状态
 const importDialogVisible = ref(false);
 
-// 查询
-async function handleQuery() {
+// 获取数据
+async function fetchData() {
   loading.value = true;
+  try {
+    const data = await UserAPI.getPage(queryParams);
+    pageData.value = data.list;
+    total.value = data.total;
+  } finally {
+    loading.value = false;
+  }
+}
+
+// 查询（重置页码后获取数据）
+function handleQuery() {
   queryParams.pageNum = 1;
-  UserAPI.getPage(queryParams)
-    .then((data) => {
-      pageData.value = data.list;
-      total.value = data.total;
-    })
-    .finally(() => {
-      loading.value = false;
-    });
+  fetchData();
 }
 
 // 重置查询
@@ -333,7 +337,7 @@ function handleResetQuery() {
   queryParams.pageNum = 1;
   queryParams.deptId = undefined;
   queryParams.createTime = undefined;
-  handleQuery();
+  fetchData();
 }
 
 // 选中项发生变化