From fe422a400712fe2d6b7d4a2140213bebb34d3239 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Wed, 19 Aug 2020 08:43:24 +0800 Subject: [PATCH] 'commit' --- .../BaseStudent/BaseStudentDao/BaseStudentDao.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go index bdedeb03..245d8a34 100644 --- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go +++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go @@ -645,8 +645,12 @@ func checkTempTable(excelPath string, s1 ExcelUtil.TemplateStruct, batchId strin var success = true /****************************************************************************/ //是否存在本次导入的身份证号与其它单位的已有身份证号相同，这样的不让导入,用蓝色标识出来 - sql := `select t1.sfzjh,t2.row_number from t_base_teacher as t1 inner join t_base_student_import_excel as t2 - on t1.sfzjh=t2.sfzjh where t2.batch_id=? and t1.bureau_id<>?` + sql := `select t1.sfzjh,t2.row_number from t_base_teacher as t1 + inner join t_base_student_import_excel as t2 + 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 t1.bureau_id<>?` listIdCardTeacher, err := db.SQL(sql, batchId, bureauId).Query().List() if err != nil { LogUtil.Error(Const.DataBaseActionError, "在查询学生的身份证号重复时发生严重错误！")