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() {