fix(用户信息): 修改用户信息存储方式

修改存储获取方式
jetlinks · Oct 10, 2020 · 65c6a0f · 65c6a0f
1 parent 711d8a5
commit 65c6a0f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/components/GlobalHeader/AvatarDropdown.tsx b/src/components/GlobalHeader/AvatarDropdown.tsx
@@ -44,6 +44,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = (props) => {
   useEffect(() => {
     service.get().subscribe((resp) => {
       setUser(resp);
+      localStorage.setItem('user-detail', JSON.stringify(resp));
       // localStorage.setItem('tenants-admin', resp.tenants[0]?.adminMember);
     })
   }, [currentUser]);

diff --git a/src/models/user.ts b/src/models/user.ts
@@ -60,7 +60,7 @@ const UserModel: UserModelType = {
           tempLogin.permissions = response.result.permissions;
           localStorage.setItem('hsweb-autz', JSON.stringify(tempLogin));
         } else {
-          // localStorage.setItem('hsweb-autz', JSON.stringify(response.result));
+          localStorage.setItem('hsweb-autz', JSON.stringify(response.result));
         }
         yield put({
           type: 'saveCurrentUser',

diff --git a/src/pages/analysis/components/Tenant/TenantDevice/index.tsx b/src/pages/analysis/components/Tenant/TenantDevice/index.tsx
@@ -127,11 +127,9 @@ const TenantDevice: React.FC<Props> = (props) => {
   const service = new Service('');
   const [data, setData] = useState<any[]>([]);
 
-  const user = JSON.parse(localStorage.getItem('hsweb-autz') || '{}');
-
-  const tenantId = user?.user.tenants.filter((i: any) => i.mainTenant)[0]?.tenantId;
-  const userId = user?.userId;
-  const tenantAdmin = user?.user.tenants.filter((i: any) => i.mainTenant)[0]?.adminMember;
+  const user = JSON.parse(localStorage.getItem('user-detail') || '{}');
+  const tenantId = (user.tenants || []).filter((i: any) => i.mainTenant)[0]?.tenantId;
+  const tenantAdmin = (user.tenants || []).filter((i: any) => i.mainTenant)[0]?.adminMember;
 
   const getProduct = (userId: string) =>
     service.assets.productNopaging(encodeQueryParam({