From 6667f8dd68ae82edc8f572acec3b0b6d6fcf0c3b Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sat, 16 Apr 2022 14:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=9F=20=E6=9B=B4=E6=96=B0tabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kicc-ui/src/api/sys/model/userModel.ts |  6 +++---
 kicc-ui/src/store/modules/user.ts      | 16 ++++++++--------
 kicc-ui/src/utils/cache/persistent.ts  |  4 ++--
 kicc-ui/types/store.d.ts               |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/kicc-ui/src/api/sys/model/userModel.ts b/kicc-ui/src/api/sys/model/userModel.ts
index 24d79620..571a76c1 100644
--- a/kicc-ui/src/api/sys/model/userModel.ts
+++ b/kicc-ui/src/api/sys/model/userModel.ts
@@ -12,7 +12,7 @@ export interface LoginParams {
 export interface UserInfo {
   accountNonExpired: boolean;
   accountNonLocked: boolean;
-  authorities: Recordable;
+  authorities: Recordable[];
   credentialsNonExpired: boolean;
   deptId: string;
   enabled: boolean;
@@ -58,9 +58,9 @@ export interface GetUserInfoModel {
   // 邮箱
   email: string;
   // 菜单按钮权限
-  permissions: Recordable;
+  permissions: Recordable[];
   // 角色ID权限
-  roleIds: Recordable;
+  roleIds: Recordable[];
   // 手机号
   phone: string;
   // 备注信息
diff --git a/kicc-ui/src/store/modules/user.ts b/kicc-ui/src/store/modules/user.ts
index 3c0e819d..0a379987 100644
--- a/kicc-ui/src/store/modules/user.ts
+++ b/kicc-ui/src/store/modules/user.ts
@@ -22,8 +22,8 @@ import {RouteRecordRaw} from 'vue-router';
 interface UserState {
   userInfo: Nullable<UserInfo>;
   sessionTimeout: boolean;
-  roleIds: Recordable;
-  permissions: Recordable;
+  roleIds: Recordable[];
+  permissions: Recordable[];
   access_token?: string;
   refresh_token?: string;
 }
@@ -36,9 +36,9 @@ export const useUserStore = defineStore({
     // 登录是否过期
     sessionTimeout: false,
     // 角色ID用于权限校验
-    roleIds: getAuthCache<Recordable>(ROLE_IDS_KEY),
+    roleIds: getAuthCache<Recordable[]>(ROLE_IDS_KEY),
     // 按钮权限标识用于权限校验
-    permissions: getAuthCache<Recordable>(PERMISSIONS_KEY),
+    permissions: getAuthCache<Recordable[]>(PERMISSIONS_KEY),
     // 访问令牌
     access_token: getAuthCache<string>(ACCESS_TOKEN_KEY),
     // 刷新令牌
@@ -57,19 +57,19 @@ export const useUserStore = defineStore({
     getSessionTimeout(): boolean {
       return !!this.sessionTimeout;
     },
-    getRoleIds(): Recordable {
+    getRoleIds(): Recordable[] {
       return this.roleIds;
     },
-    getPermissions(): Recordable {
+    getPermissions(): Recordable[] {
       return this.permissions;
     },
   },
   actions: {
-    setRoleIds(roleIds: Recordable) {
+    setRoleIds(roleIds: Recordable[]) {
       this.roleIds = roleIds;
       setAuthCache(ROLE_IDS_KEY, roleIds);
     },
-    setPermissions(permissions: Recordable) {
+    setPermissions(permissions: Recordable[]) {
       this.permissions = permissions;
     },
     setAccessToken(accessToken: string) {
diff --git a/kicc-ui/src/utils/cache/persistent.ts b/kicc-ui/src/utils/cache/persistent.ts
index 39f66c5d..cd0ae90c 100644
--- a/kicc-ui/src/utils/cache/persistent.ts
+++ b/kicc-ui/src/utils/cache/persistent.ts
@@ -28,8 +28,8 @@ import { pick, omit } from 'lodash-es';
 interface BasicStore {
   [ACCESS_TOKEN_KEY]: string | number | null | undefined;
   [REFRESH_TOKEN_KEY]: string | number | null | undefined;
-  [ROLE_IDS_KEY]: Recordable;
-  [PERMISSIONS_KEY]: Recordable;
+  [ROLE_IDS_KEY]: Recordable[];
+  [PERMISSIONS_KEY]: Recordable[];
   [USER_INFO_KEY]: UserInfo;
   [LOCK_INFO_KEY]: LockInfo;
   [PROJ_CFG_KEY]: ProjectConfig;
diff --git a/kicc-ui/types/store.d.ts b/kicc-ui/types/store.d.ts
index 5bbebd75..aba7272a 100644
--- a/kicc-ui/types/store.d.ts
+++ b/kicc-ui/types/store.d.ts
@@ -31,9 +31,9 @@ export interface UserInfo {
   // 邮箱
   email: string;
   // 菜单按钮权限
-  permissions: Recordable;
+  permissions: Recordable[];
   // 角色ID权限
-  roleIds: Recordable;
+  roleIds: Recordable[];
   // 手机号
   phone: string;
   // 备注信息