From b331f884097a2dc5086c8cf043c8c8f52e7640fe Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:34:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/hooks/useUser.ts | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/hooks/useUser.ts b/src/hooks/useUser.ts
index 1d23af1..5587aef 100644
--- a/src/hooks/useUser.ts
+++ b/src/hooks/useUser.ts
@@ -1,23 +1,15 @@
import { useUserStore } from '@/store/modules/user';
import { UserUtils } from '@bole-core/core';
-// import * as userRoleServices from '@/services/api/UserRole';
-import * as userServices from '@/services/api/User';
import { useQuery, useQueryClient } from '@tanstack/vue-query';
-
-export function useIsSystemAdmin() {
- const userStore = useUserStore();
- const { accountInfo } = storeToRefs(userStore);
- const isSystemAdmin = computed(() => UserUtils.isSystemRole(accountInfo.value));
- return isSystemAdmin;
-}
export function useUser() {
const userStore = useUserStore();
- const { userId, userInfo } = storeToRefs(userStore);
+ const { userId, userInfo, userDetail } = storeToRefs(userStore);
return {
user: userInfo,
userId: userId,
+ userDetail: userDetail,
};
}
--
Gitblit v1.9.1