For robustness

close #1661

For robustness
close #1661
43a570da · Amumu · 偏右 · 2465ac2c · 43a570da
Commit 43a570da authored Jun 20, 2018 by Amumu Committed by 偏右 Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

src/components/GlobalHeader/index.js src/components/GlobalHeader/index.js +5 -2

No files found.
--- a/src/components/GlobalHeader/index.js
+++ b/src/components/GlobalHeader/index.js
@@ -13,8 +13,8 @@ export default class GlobalHeader extends PureComponent {
    this.triggerResizeEvent.cancel();
  }
  getNoticeData() {
-    const { notices = [] } = this.props;
-    if (notices.length === 0) {
+    const { notices} = this.props;
+    if (notices == null || notices.length === 0) {
      return {};
    }
    const newNotices = notices.map(notice => {
@@ -66,6 +66,9 @@ export default class GlobalHeader extends PureComponent {
      onMenuClick,
      onNoticeClear,
    } = this.props;
+    if (currentUser == null) {
+      currentUser = {}
+    }
    const menu = (
      <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick}>
        <Menu.Item disabled>