From 2647c4380e3f3591498585c1d2813e99a8f81357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sun, 8 Mar 2020 15:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/redux/actions/ojForm.js | 72 +++++++++++++-----------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index b11c99a8b..1c88cec41 100644
--- a/public/react/src/redux/actions/ojForm.js
+++ b/public/react/src/redux/actions/ojForm.js
@@ -142,7 +142,7 @@ export const validateOjForm = (props, type, cb) => {
         let validateResult = emptyValidate(key, value);
         const errMsg = validateResult[key].errMsg;
         if (errMsg) {
-          // hasSuccess = false;
+         hasSuccess = false;
         } else {
           // 唯一性校验
           const bool = testCases.some((item, j) => {
@@ -167,38 +167,7 @@ export const validateOjForm = (props, type, cb) => {
       });
       tcValidResult.push(tempObj);
     });
-		 try {
-		 if(ojForm.sub_discipline_id.length===0){
-				 hasSuccess = false;
-				 notification['error']({
-					 message: '提示',
-					 description: '课程必须选择!'
-				 });
-
-			 }else  if(ojForm.timeLimit===null){
-				 hasSuccess = false;
-				 notification['error']({
-					 message: '提示',
-					 description: '时间限制必须输入!'
-				 });
-			 } else if(ojForm.name.length===0){
-			 hasSuccess = false;
-			 notification['error']({
-				 message: '提示',
-				 description: '任务名称必须输入!'
-			 });
-
-		 }else if(ojForm.description.length===0){
-				 hasSuccess = false;
-				 notification['error']({
-					 message: '提示',
-					 description: '描述必须输入!'
-				 });
-			 }
-
-		 }catch (e) {
-
-		 }
+
 
     // if (testCases.length === 0) {
     //   hasSuccess = false;
@@ -233,6 +202,43 @@ export const validateOjForm = (props, type, cb) => {
         payload: false
       });
     }
+
+
+		try {
+			if(ojForm.sub_discipline_id.length===0){
+				hasSuccess = false;
+				notification['error']({
+					message: '提示',
+					description: '课程必须选择!'
+				});
+
+			}else  if(ojForm.timeLimit===null){
+				hasSuccess = false;
+				notification['error']({
+					message: '提示',
+					description: '时间限制必须输入!'
+				});
+			} else if(ojForm.name.length===0){
+				hasSuccess = false;
+				notification['error']({
+					message: '提示',
+					description: '任务名称必须输入!'
+				});
+
+			}else if(ojForm.description.length===0){
+				hasSuccess = false;
+				notification['error']({
+					message: '提示',
+					description: '描述必须输入!'
+				});
+			}
+
+		}catch (e) {
+
+		}
+
+
+
     /** 表单验证结束 */
     /** 表单验证通过后，调用保存 or 更新 or 发布  */
     if (hasSuccess) {