'commit'

dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go

@@ -660,7 +660,7 @@ func checkTempTable(excelPath string, s1 ExcelUtil.TemplateStruct, batchId strin
 			on t1.sfzjh=t2.sfzjh 
 			inner join t_base_teacher_org as t3
 			on t1.person_id=t3.person_id and t3.b_use=1 and t3.is_main=1
-			where t2.batch_id=? and t3.bureau_id<>?`
+			where t2.batch_id=? and t3.bureau_id<>? and t1.sfzjh<>''`
 	listIdCardTeacher, err := db.SQL(sql, batchId, bureauId).Query().List()
 	if err != nil {
 		LogUtil.Error(Const.DataBaseActionError, "在查询学生的身份证号重复时发生严重错误！")

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -588,7 +588,7 @@ func checkTempTable(excelPath string, s1 ExcelUtil.TemplateStruct, batchId strin
 			on t1.sfzjh=t2.sfzjh 
 			inner join t_base_teacher_org as t3
 			on t1.person_id=t3.person_id and t3.b_use=1 and t3.is_main=1
-			where t2.batch_id=? and t3.bureau_id<>?`
+			where t2.batch_id=? and t3.bureau_id<>? and t1.sfzjh<>''`
 	listIdCardTeacher, err := db.SQL(sql, batchId, bureauId).Query().List()
 	if err != nil {
 		LogUtil.Error(Const.DataBaseActionError, "在查询教师的身份证号重复时发生严重错误！")
@@ -606,7 +606,7 @@ func checkTempTable(excelPath string, s1 ExcelUtil.TemplateStruct, batchId strin
 	/****************************************************************************/
 	//检查学生的身份证号重复
 	sql = `select t1.sfzjh,t2.row_number from t_base_student as t1  inner join t_base_teacher_import_excel as t2
-			on t1.sfzjh=t2.sfzjh where t2.batch_id=? and t1.bureau_id<>?`
+			on t1.sfzjh=t2.sfzjh where t2.batch_id=? and t1.bureau_id<>? and t1.sfzjh<>''`
 	listIdCardStudent, err := db.SQL(sql, batchId, bureauId).Query().List()
 	if err != nil {
 		LogUtil.Error(Const.DataBaseActionError, "在查询学生的身份证号重复时发生严重错误！")