'commit'

dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go

@@ -483,14 +483,13 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapClass map[stri
 			}
 			//(9)身份证号
 			if j == 9 {
-				if row[j-1] == "居民身份证" && !CommonUtil.IsIdCard(CommonUtil.CompressStr(row[j])) {
+				if row[j-1] == "居民身份证" && row[j] != "" && !CommonUtil.IsIdCard(CommonUtil.CompressStr(row[j])) {
-					pass = false
-				}
-				if row[j] == "" {
 					pass = false
 				}
+				if len(row[j]) > 0 {
 					_idCardMap[CommonUtil.CompressStr(row[j])] = append(_idCardMap[CommonUtil.CompressStr(row[j])], i+1)
 				}
+			}
 			//(10)独生子女
 			if j == 10 {
 				if _, ok := SysDictKit.MapTrueOrFalseNameToValue[row[j]]; !ok {