From 2cbe91a38e4cd7109d91e97ed6a1c0003958a4ee Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Thu, 6 Aug 2020 13:56:42 +0800
Subject: [PATCH] 'commit'

---
 .../BaseTeacher/BaseTeacherDao/BaseTeacherDao.go           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
index 7f25377e..94b2f3a2 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
@@ -185,7 +185,7 @@ func FillMainBureauOrgInfo(list2 *[]map[string]interface{}) {
 
 	for i := range list {
 		for j := range _listExtendInfo {
-			if _listExtendInfo[j]["person_id"]== list[i]["person_id"] {
+			if _listExtendInfo[j]["person_id"] == list[i]["person_id"] {
 				list[i]["x_bureau_id"] = _listExtendInfo[j]["bureau_id"]
 				list[i]["x_org_id"] = _listExtendInfo[j]["org_id"]
 				list[i]["x_province_code"] = _listExtendInfo[j]["province_code"]
@@ -681,8 +681,11 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[st
 			continue
 		}
 		//如果连续三个格为空，则不记入预导入行
+		if len(row) == 0 {
+			break
+		}
 		if row[0] == "" && row[1] == "" && row[2] == "" {
-			continue
+			break
 		}
 		//真实显示的字段，不要把名称管理器的内容遍历出来
 		for j := 0; j < len(s1.Cols); j++ {