|
@@ -51,17 +51,19 @@ export function getUserInfoMethod(token?: string) {
|
|
|
cacheFor: 0,
|
|
cacheFor: 0,
|
|
|
headers: { Authorization: token },
|
|
headers: { Authorization: token },
|
|
|
transform(data, headers) {
|
|
transform(data, headers) {
|
|
|
|
|
+ const user = data?.user ?? data;
|
|
|
|
|
+ const userId = user?.userId ?? user?.userid;
|
|
|
return {
|
|
return {
|
|
|
- avatar: data?.headImage,
|
|
|
|
|
- realName: '',
|
|
|
|
|
- roles: data?.roles?.map(fromRole) ?? [],
|
|
|
|
|
- userId: data?.userid,
|
|
|
|
|
- username: data?.username,
|
|
|
|
|
- // user
|
|
|
|
|
|
|
+ avatar: user?.avatar ?? user?.headImage ?? '',
|
|
|
|
|
+ realName: user?.nickName ?? '',
|
|
|
|
|
+ roles: (user?.roles ?? data?.roles)?.map(fromRole) ?? [],
|
|
|
|
|
+ userId: userId === undefined || userId === null ? '' : String(userId),
|
|
|
|
|
+ username: user?.userName ?? user?.username ?? '',
|
|
|
|
|
+ deptName: user?.dept?.deptName ?? '',
|
|
|
token: token ?? headers.get('authorization') ?? '',
|
|
token: token ?? headers.get('authorization') ?? '',
|
|
|
homePath: '',
|
|
homePath: '',
|
|
|
desc: '',
|
|
desc: '',
|
|
|
- } satisfies UserInfo;
|
|
|
|
|
|
|
+ } satisfies UserInfo & { deptName?: string };
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
);
|
|
);
|