diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go index 94b2f3a2..8d5024c1 100644 --- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go +++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go @@ -486,8 +486,11 @@ func readToTable(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[s continue } //如果连续三个格为空,则不记入预导入行 + if len(row) == 0 { + break + } if row[0] == "" && row[1] == "" && row[2] == "" { - continue + break } //导入到临时表中 var m models.TBaseTeacherImportExcel diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go index f61a419f..65a2f9d1 100644 --- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go +++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go @@ -278,7 +278,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA model.Zcm = in.Zcm model.Bzlbm = in.Bzlbm //排序号 - BaseTeacherDao.UpdateSortId(model.PersonId,in.SortId) + BaseTeacherDao.UpdateSortId(model.PersonId, in.SortId) //从教年月 if len(in.Cjny) == 0 { model.Cjny = DateUtil.ConvertDate("1900-01-01")