From b7f87b1d24d49058844d58b36e47826fb0538051 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Wed, 30 Sep 2020 15:11:19 +0800
Subject: [PATCH] 'commit'

---
 .../BaseStudent/BaseStudentDao/BaseStudentDao.go           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
index e9282cc2..00bd4b18 100644
--- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
+++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
@@ -341,7 +341,10 @@ func ImportStudentInfoExcel(excelPath string, bureauId string, actionPersonId st
 	}
 	//2、对excel的合法性进行检查
 	excelSuccess = checkExcel(excelPath, s1, MapClass, MapStage)
-
+	//两个有一个不成功，则提示
+	if !excelSuccess {
+		return false, "02", nil //02:在excel检测中，发现问题，请检查后重新上传！
+	}
 	//将excel文件读取到mysql的临时数据表中
 	err := readToTable(excelPath, s1, MapClass, bureauId, batchId, MapStage)
 	if err != nil {
@@ -351,7 +354,7 @@ func ImportStudentInfoExcel(excelPath string, bureauId string, actionPersonId st
 	mysqlSuccess = checkTempTable(excelPath, s1, batchId, bureauId)
 
 	//两个有一个不成功，则提示
-	if !excelSuccess || !mysqlSuccess {
+	if !mysqlSuccess {
 		return false, "02", nil //02:在excel检测中，发现问题，请检查后重新上传！
 	}