From 1b4438a9b7ec29d993fd06e2ae65b7e5c3028052 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Wed, 19 Aug 2020 09:09:31 +0800 Subject: [PATCH] 'commit' --- .../RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go | 2 +- .../RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go index 45bdc524..a29e0010 100644 --- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go +++ b/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, "在查询学生的身份证号重复时发生严重错误！") diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go index 69b6922b..46d153ab 100644 --- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go +++ b/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, "在查询学生的身份证号重复时发生严重错误！")