From 17c5321780c96be4c730125820305634f73625df Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 21 Apr 2022 07:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=9F=20=E6=9E=84=E5=BB=BA=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kicc-ui/src/utils/http/axios/index.ts      | 17 +++++++++++++----
 kicc-ui/src/views/system/menu/menu.data.ts |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/kicc-ui/src/utils/http/axios/index.ts b/kicc-ui/src/utils/http/axios/index.ts
index 0199450d..f8fa9c66 100644
--- a/kicc-ui/src/utils/http/axios/index.ts
+++ b/kicc-ui/src/utils/http/axios/index.ts
@@ -39,12 +39,21 @@ const transform: AxiosTransform = {
       return res;
     }
 
-    // 检查是否有code,并且等于200,直接返回结果
-    const { data } = res;
-    const hasSuccess = data && Reflect.has(data, 'code') && data.code === ResultEnum.SUCCESS;
-    if (hasSuccess) {
+    // 检查是否有code,并且code等于200,直接返回结果
+    const { data }  = res;
+    const hasCode = data && Reflect.has(data, 'code');
+    if (hasCode && data.code === ResultEnum.SUCCESS) {
       return data.data;
+    // 检查是否有code,如果code不等于200,说明返回的结果集有错误,直接抛错
+    } else if (hasCode && data.code !== ResultEnum.SUCCESS) {
+      if (options.errorMessageMode === 'modal') {
+        createErrorModal({ title: t('sys.api.errorTip'), content: data?.msg });
+      } else if (options.errorMessageMode === 'message') {
+        createMessage.error(data?.msg);
+      }
+      throw new Error(data?.msg || t('sys.api.errMsgDefault'));
     }
+
     return data;
 
   },
diff --git a/kicc-ui/src/views/system/menu/menu.data.ts b/kicc-ui/src/views/system/menu/menu.data.ts
index 033adc3b..0755f9cc 100644
--- a/kicc-ui/src/views/system/menu/menu.data.ts
+++ b/kicc-ui/src/views/system/menu/menu.data.ts
@@ -1,6 +1,6 @@
 /**
  * @program: kicc-ui
- * @description: 菜单动态生成配置
+ * @description: 菜单模块动态渲染配置
  * @author: entfrm开发团队-王翔
  * @create: 2022/4/21
  */