diff --git a/src/glcc/student/index.jsx b/src/glcc/student/index.jsx
index 98aeeb684..408462d6d 100644
--- a/src/glcc/student/index.jsx
+++ b/src/glcc/student/index.jsx
@@ -84,40 +84,50 @@ function Apply(props) {
           userId: current_user.user_id,
           profession: data.profession,
         };
-        console.log(applyInfo);
-        if (Array.isArray(data.registrationStudentTaskList) && data.registrationStudentTaskList.length) {
-          let initTaskList = [];
-          for (const [i, item] of data.registrationStudentTaskList.entries()) {
-            applyInfo['memo' + i] = item.memo;
-            applyInfo['taskId' + i] = item.taskId;
-            applyInfo['memoAttachmentId' + i] = item.memoAttachmentId;
 
-            if (i == 0) {
-              setFiles([{
-                name: item.memoAttachment && item.memoAttachment.fileName || '已上传文件',
-                id: item.memoAttachmentId,
-                uid: item.memoAttachmentId
-              }]);
-            } else {
-              setFiles1([{
-                name: item.memoAttachment && item.memoAttachment.fileName || '已上传文件',
-                id: item.memoAttachmentId,
-                uid: item.memoAttachmentId,
-              }]);
+        if (Array.isArray(data.registrationStudentTaskList)) {
+          if (data.registrationStudentTaskList.length) {
+            let initTaskList = [];
+            for (const [i, item] of data.registrationStudentTaskList.entries()) {
+              applyInfo['memo' + i] = item.memo;
+              applyInfo['taskId' + i] = item.taskId;
+              applyInfo['memoAttachmentId' + i] = item.memoAttachmentId;
+
+              if (i == 0) {
+                setFiles([{
+                  name: item.memoAttachment && item.memoAttachment.fileName || '已上传文件',
+                  id: item.memoAttachmentId,
+                  uid: item.memoAttachmentId
+                }]);
+              } else {
+                setFiles1([{
+                  name: item.memoAttachment && item.memoAttachment.fileName || '已上传文件',
+                  id: item.memoAttachmentId,
+                  uid: item.memoAttachmentId,
+                }]);
+              }
+
+              initTaskList.push({
+                id: item.id,
+                memo: item.memo,
+                memoAttachmentId: item.memoAttachmentId,
+                taskId: item.taskId,
+              });
             }
+            setMyTaskList(initTaskList);
 
-            initTaskList.push({
-              id: item.id,
-              memo: item.memo,
-              memoAttachmentId: item.memoAttachmentId,
-              taskId: item.taskId,
-            });
-          }
-          setMyTaskList(initTaskList);
-
-          // 如果只有一条报名数据，且课题id与当前id不一致，那么新增一条默认数据
-          if (data.registrationStudentTaskList.length === 1 && data.registrationStudentTaskList[0].taskId != taskId) {
-            addTask(data.registrationStudentTaskList);
+            // 如果只有一条报名数据，且课题id与当前id不一致，那么新增一条默认数据
+            if (data.registrationStudentTaskList.length === 1 && data.registrationStudentTaskList[0].taskId != taskId) {
+              addTask(data.registrationStudentTaskList);
+            }
+          } else {
+            // 先增加数据再给选择框赋默认值，否则不生效
+            new Promise((resove) => {
+              setMyTaskList(() => {
+                resove();
+                return [initTask]
+              });
+            }).then(res => setFieldsValue({ 'taskId0': taskId }))
           }
         }
 
@@ -152,7 +162,7 @@ function Apply(props) {
         setLoading(true);
         const params = {
           grade: values.grade,
-          location: values.location.join(),
+          location: Array.isArray(values.location) && values.location.join(),
           mail: values.mail,
           phone: values.phone,
           proveAttachmentId: values.proveAttachmentId.file ? values.proveAttachmentId.file.response.id : userApplyInfo.proveAttachmentId,
@@ -451,7 +461,7 @@ function Apply(props) {
             }
 
             {
-              myTaskList.length < 2 && <Button className="add_task" type="primary" onClick={addTask}>添加课题</Button>
+              myTaskList.length < 2 && <Button className="add_task" type="primary" onClick={() => { addTask() }}>添加课题</Button>
             }
 
             <Form.Item className='subInfo introArea'>