diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go index 5ee2824a..c80a9bb7 100644 --- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go +++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go @@ -717,7 +717,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_student_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, "在查询学生的身份证号重复时发生严重错误!") @@ -726,7 +726,7 @@ func checkTempTable(excelPath string, s1 ExcelUtil.TemplateStruct, batchId strin //存在学生身份证号检查重复 for i := range listIdCardStudent { rowNumber := listIdCardStudent[i]["row_number"].(int64) - cell := "H" + CommonUtil.ConvertInt64ToString(rowNumber) + cell := "J" + CommonUtil.ConvertInt64ToString(rowNumber) style, _ := f.GetCellStyle(s1.Title, Const.YellowCell) _ = f.SetCellStyle(s1.Title, cell, cell, style) //设计二级检查失败