From 987bf020bab76d4eb3def6f917b2c6c89dc299b8 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 6 Feb 2024 13:57:51 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E3=80=90ID1000388=E3=80=91=E4=BB=AA?=
 =?UTF-8?q?=E5=99=A8=E7=AE=A1=E7=90=86-=E4=BB=AA=E5=99=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E4=BB=AA=E5=99=A8ID=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=97=B6=EF=BC=8C=E6=8A=A5=EF=BC=9A=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E2=80=9Cjava.lang=E2=80=9D=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=80=BC=E5=A4=B1=E8=B4=A5=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E6=90=9C=E7=B4=A2=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=8F=90=E7=A4=BA=E6=9A=82=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/security/handler/GlobalExceptionHandler.java      | 2 +-
 flossom-ui/src/views/system/instrument/index.vue             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/handler/GlobalExceptionHandler.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/handler/GlobalExceptionHandler.java
index c95b554..67b73e6 100644
--- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/handler/GlobalExceptionHandler.java
+++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/handler/GlobalExceptionHandler.java
@@ -140,7 +140,7 @@ public class GlobalExceptionHandler
     {
         log.error(e.getMessage(), e);
         String message = e.getAllErrors().get(0).getDefaultMessage();
-        return AjaxResult.error(message);
+        return AjaxResult.error("参数格式不正确");
     }
 
     /**
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index 0445de8..ed39f10 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -1514,8 +1514,9 @@ export default {
 			listInstrument(this.queryParams).then((response) => {
 				this.instrumentList = response.rows
 				this.total = response.total
-				this.loading = false
-			})
+			}).finally(() => {
+        this.loading = false
+      })
 		},
 		// 取消按钮
 		cancel() {