From a7c2120cf3c9f10390b68d161df2c678be8e30ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 13 Oct 2021 13:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/Header.js            | 7 +++----
 src/forge/SecuritySetting/Index.jsx | 7 ++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 59513153..9e10a0ff 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -367,7 +367,6 @@ class NewHeader extends Component {
     }
 
     let search_url = settings && settings.common && settings.common.search;
-    let notice_url = settings && settings.common && settings.common.notice;
     return (
       <div className="newHeaders" id="nHeader">
         <div className="headerContent">
@@ -438,7 +437,7 @@ class NewHeader extends Component {
               </Dropdown>:""
             }
             
-            {current_user && current_user.login ?
+            { settings && settings.common && settings.common.notice ?
               <Popover
                 overlayClassName="notice-popover"
                 placement={`bottomRight`}
@@ -448,9 +447,9 @@ class NewHeader extends Component {
                 destroyTooltipOnHide
               >
                 <Link to={"/settings/notice"} className="message-icon">
-                  <Badge count={current_user.message_unread_total}>
+                  {current_user && <Badge count={current_user.message_unread_total}>
                     <i className="iconfont icon-xiaoxilingdang color-grey-6 ml15 mr15"></i>
-                  </Badge>
+                  </Badge>}
                 </Link>
               </Popover>
               : ""
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index 8419fd31..f897dea1 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -43,8 +43,9 @@ const PrivateLetter = Loadable({
 });
 
 function Index(props){
-  const { current_user } = props;
+  const { current_user,mygetHelmetapi } = props;
   const { pathname } = props.location;
+  const notice_url = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice;
 
   return(
     <div className="newMain clearfix whiteBack">
@@ -59,11 +60,11 @@ function Index(props){
               <li>个人信息</li>
               <li className={pathname.indexOf("/settings/profile")>-1 ?"active":""}><Link to={`/settings/profile`}><i className="iconfont icon-gerenziliao mr5 font-14"></i><span className="text-shodow-bold">基本资料</span></Link></li>
             </ul>
-            <ul className="securityUl ul-border-buttom">
+            {notice_url && <ul className="securityUl ul-border-buttom">
               <li>消息通知</li>
               <li className={(pathname.indexOf("/settings/notice")>-1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={"/settings/notice"}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
               {/* <li className={pathname.indexOf("/settings/notice/config")>-1 ?"active":""}><Link to={'/settings/notice/config'}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li> */}
-            </ul>
+            </ul>}
             <ul className="securityUl">
               <li>安全设置</li>
               <li className={pathname.indexOf("/settings/SSH")>-1 ?"active":""}><Link to={`/settings/SSH`}><i className="iconfont icon-xuanzhongssh_icon mr5 font-14"></i><span className="text-shodow-bold">SSH密钥</span></Link></li>