diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx
index d29dfb72..666e4a0d 100644
--- a/src/forge/Head/NoticeContent.jsx
+++ b/src/forge/Head/NoticeContent.jsx
@@ -190,11 +190,11 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
         className='hoverNotice-body' // 外部添加className加以区分
         onPullRefresh={() => { setNoticePage(noticePage + 1); }} //触发加载ajax的function
         // type={2} // 传送加载组件的状态
-        count={noticeUnreadList.length} // 数据当前的总数量
+        count={noticeUnreadList&&noticeUnreadList.length} // 数据当前的总数量
         pageSize={10} // 
       >
         {
-          noticeUnreadList.map(item => {
+         Array.isArray(noticeUnreadList)&& noticeUnreadList.map(item => {
             return (
               <div key={item.id + Math.random()} className="noticeCont-back" onClick={() => { readItem(item) }}>
                 <div className={`noticeCont ${item.notification_url?'pointer':''}`}>
diff --git a/src/glcc/student/index.jsx b/src/glcc/student/index.jsx
index dcb21728..3077a7fd 100644
--- a/src/glcc/student/index.jsx
+++ b/src/glcc/student/index.jsx
@@ -152,7 +152,8 @@ function Apply(props) {
             setMyTaskList(initTaskList);
             setLocked(lockedCurrent);
             // 如果未被锁定，且小于3条报名数据，且课题id与当前id不一致，那么新增一条默认数据
-            if (!lockedCurrent && data.registrationStudentTaskList.length < 3 && data.registrationStudentTaskList[0].taskId != taskId) {
+            let taskIdArr=data.registrationStudentTaskList.map(i=>{return i.taskId});
+            if (!lockedCurrent && data.registrationStudentTaskList.length < 3 && !taskIdArr.includes(taskId)) {
               addTask(data.registrationStudentTaskList);
             }
           } else {
@@ -487,7 +488,7 @@ function Apply(props) {
                 myTaskList.map((item, i) => {
                   return (
                     <Fragment key={item.taskId + '' + i}>
-                      <h4 className="item-tit">课题信息（<span className="item-tit-num">{i + 1}</span>/3)
+                      <h4 className="item-tit">课题信息（<span className="item-tit-num">{i + 1}</span>)
                         {/* {myTaskList.length > 1 && <span className="delete" onClick={() => { deleteTask(i) }}><i className="iconfont icon-shanchu mr5"></i>删除</span>} */}
                       </h4>
                       {item.status == 1 && item.auditRemark && <div className="reject-reason">