From d8064e3f671e38e1d3ceead5d8e148493200bef4 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 16 Feb 2022 15:42:16 +0800
Subject: [PATCH] edit

---
 src/app/layout/pro/components/user/user.component.html | 4 ++--
 src/app/shared/services/business/user.service.ts       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/layout/pro/components/user/user.component.html b/src/app/layout/pro/components/user/user.component.html
index 5d5ce1a1..6d615e26 100644
--- a/src/app/layout/pro/components/user/user.component.html
+++ b/src/app/layout/pro/components/user/user.component.html
@@ -1,6 +1,6 @@
 <div nz-dropdown [nzDropdownMenu]="userMenu" nzPlacement="bottomRight" class="alain-pro__header-item">
-  <nz-avatar [nzSrc]="settings.user.avatar" nzSize="small" class="mr-sm"></nz-avatar>
-  {{ settings.user.realName }}
+  <nz-avatar [nzSrc]="settings.user?.avatar" nzSize="small" class="mr-sm"></nz-avatar>
+  {{ settings.user?.realName }}
 </div>
 <nz-dropdown-menu #userMenu="nzDropdownMenu">
   <div nz-menu class="width-sm">
diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts
index a1234259..caf9afe4 100644
--- a/src/app/shared/services/business/user.service.ts
+++ b/src/app/shared/services/business/user.service.ts
@@ -155,8 +155,8 @@ export class EAUserService extends BaseService {
     return this.asyncRequest(this.$api_get_user_menus, {
       appId: this.envSrv.getEnvironment().appId
     }).then(res => {
-      this.cacheSrv.set(cacheConf.menu, res.data);
-      this.menuService.add(res.data);
+      this.cacheSrv.set(cacheConf.menu, res);
+      this.menuService.add(res);
     });
     // this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => {
     //   this.cacheSrv.set(cacheConf.menu, res.menu);