From 7461a0225ee99071120fbe58a6a7c1c095534f1e Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sun, 1 May 2022 21:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E5=88=B6=E5=AE=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83=E6=A8=A1=E6=9D=BF=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kicc-ui/src/api/system/menu.ts             | 7 ++++++-
 kicc-ui/src/api/system/role.ts             | 9 +++++++--
 kicc-ui/src/api/system/user.ts             | 9 +++++++--
 kicc-ui/src/views/system/user/user.data.ts | 3 ++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/kicc-ui/src/api/system/menu.ts b/kicc-ui/src/api/system/menu.ts
index 8186d494..aaa0bf34 100644
--- a/kicc-ui/src/api/system/menu.ts
+++ b/kicc-ui/src/api/system/menu.ts
@@ -1,4 +1,9 @@
-import { MenuDto, Menu, MenuVo } from './model/menuModel';
+/**
+ * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+ * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
+ * author entfrm开发团队-王翔
+ */
+import { MenuDto, Menu } from './model/menuModel';
 import { ResultVo } from '../model';
 import { defHttp } from '/@/utils/http/axios';
 
diff --git a/kicc-ui/src/api/system/role.ts b/kicc-ui/src/api/system/role.ts
index a63bdd3d..4a4fff49 100644
--- a/kicc-ui/src/api/system/role.ts
+++ b/kicc-ui/src/api/system/role.ts
@@ -1,4 +1,9 @@
-import { Role, RoleDto } from './model/roleModel';
+/**
+ * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+ * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
+ * author entfrm开发团队-王翔
+ */
+import { Role, RoleDto, RoleVo } from './model/roleModel';
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
@@ -11,7 +16,7 @@ enum Api {
 }
 
 // 查询角色列表
-export const listRole = (params?: Partial<RoleDto>) => defHttp.get({ url: Api.list, params });
+export const listRole = (params?: Partial<RoleDto>) => defHttp.get<RoleVo>({ url: Api.list, params }, { isReturnResultResponse: true });
 
 // 新增角色
 export const addRole = (params: Partial<Role>) => defHttp.post({ url: Api.add, data: params });
diff --git a/kicc-ui/src/api/system/user.ts b/kicc-ui/src/api/system/user.ts
index dfdb051b..cf22e743 100644
--- a/kicc-ui/src/api/system/user.ts
+++ b/kicc-ui/src/api/system/user.ts
@@ -1,4 +1,9 @@
-import { User, UserDto } from './model/userModel';
+/**
+ * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+ * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
+ * author entfrm开发团队-王翔
+ */
+import { User, UserDto, UserVo } from './model/userModel';
 import { defHttp } from '/@/utils/http/axios';
 import { ResultVo } from "/@/api/model";
 
@@ -14,7 +19,7 @@ enum Api {
 }
 
 // 查询用户列表
-export const listUser = (params?: Partial<UserDto>) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true });
+export const listUser = (params?: Partial<UserDto>) => defHttp.get<UserVo>({ url: Api.list, params }, { isReturnResultResponse: true });
 
 // 新增用户
 export const addUser = (params: Partial<User>) => defHttp.post({ url: Api.add, data: params });
diff --git a/kicc-ui/src/views/system/user/user.data.ts b/kicc-ui/src/views/system/user/user.data.ts
index dbb6ddfa..e3646a8e 100644
--- a/kicc-ui/src/views/system/user/user.data.ts
+++ b/kicc-ui/src/views/system/user/user.data.ts
@@ -243,7 +243,8 @@ export const userFormSchema: FormSchema[] = [
       mode: 'multiple',
       api: listRole,
       labelField: 'name',
-      valueField: 'id'
+      valueField: 'id',
+      resultField: 'data'
     },
     colProps: {
       span: 12