From e6271f8d8a6250a972177c989c4b9730e4e8104a Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Wed, 4 Jan 2023 10:18:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/JeecgListMixin.js                             | 2 +-
 src/views/modules/ServerInfo/modules/ServerInfoModal.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 2a09ddf..9ed6afd 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -123,7 +123,7 @@ export const JeecgListMixin = {
         sqp['superQueryMatchType'] = this.superQueryMatchType
       }
       var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
-      param.field = this.getQueryField();
+      // param.field = this.getQueryField();
       param.pageNo = this.ipagination.current;
       param.pageSize = this.ipagination.pageSize;
       return filterObj(param);
diff --git a/src/views/modules/ServerInfo/modules/ServerInfoModal.vue b/src/views/modules/ServerInfo/modules/ServerInfoModal.vue
index 0870aa7..44b1193 100644
--- a/src/views/modules/ServerInfo/modules/ServerInfoModal.vue
+++ b/src/views/modules/ServerInfo/modules/ServerInfoModal.vue
@@ -108,6 +108,7 @@ export default {
                     } else {
                       this.model.status = 0
                     }
+                    let success = true;
                     httpAction(httpurl, this.model, method)
                         .then(res => {
                             if (res.success) {
@@ -115,11 +116,14 @@ export default {
                                 that.$emit('ok')
                             } else {
                                 that.$message.warning(res.message)
+                                success = false;
                             }
                         })
                         .finally(() => {
                             that.confirmLoading = false
-                            that.close()
+                            if (success) {
+                              that.close()
+                            }
                         })
                 } else {
                     return false