diff --git a/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go b/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go index eabb2ba..520fc22 100644 --- a/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go +++ b/app/admin/hdl/enterprise_manage/hdl_self_support_for_school.go @@ -927,13 +927,19 @@ func SelfSupportForSchoolImportTeacher(c *gin.Context) { xlsx, err := excelize.OpenFile(dst) rows := xlsx.GetRows("Sheet" + "1") for key, row := range rows { - if key > 0 && (row[0] != "" && row[1] != "") { + if key > 0 && ((row[0] != "" || row[1] != "") && row[2] != "") { idNo := row[0] - name := row[1] + certType := enum.UserIdentityCertTypeForIdCard + if idNo == "" { + idNo = row[1] + certType = enum.UserIdentityCertTypeForStudentId + } + name := row[2] + //1、查找当前身份是否已存在 userIdentityDb := db.UserIdentityDb{} userIdentityDb.Set(0) - isHasUserIdentity, err := userIdentityDb.UserIdentityExist(enterpriseId, idNo, enum.UserIdentityCertTypeForIdCard) + isHasUserIdentity, err := userIdentityDb.UserIdentityExist(enterpriseId, idNo, certType) if err != nil { e.OutErr(c, e.ERR_DB_ORM, err.Error()) return @@ -948,7 +954,7 @@ func SelfSupportForSchoolImportTeacher(c *gin.Context) { Uid: 0, Name: name, IdNo: idNo, - CertType: enum.UserIdentityCertTypeForIdCard, + CertType: certType, Kind: enum.UserIdentityKindForCommon, Identity: enum.UserIdentityForSelfSupportForTeacher, EnterpriseId: enterpriseId, diff --git a/static/template/自营学校(教师信息导入模板).xlsx b/static/template/自营学校(教师信息导入模板).xlsx index a2ed8ad..a7e740f 100644 Binary files a/static/template/自营学校(教师信息导入模板).xlsx and b/static/template/自营学校(教师信息导入模板).xlsx differ