From b1291f384e3d5c9f14f68ca1859479897375320b Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Tue, 18 Aug 2020 17:34:18 +0800
Subject: [PATCH] 'commit'

---
 .../BaseTeacherDao/BaseTeacherDao.go            | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
index 6fdf3446..9addc181 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
@@ -18,7 +18,6 @@ import (
 	"dsBaseRpc/Utils/RedisUtil"
 	"dsBaseRpc/Utils/SqlKit"
 	"dsBaseRpc/models"
-	"fmt"
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 	"github.com/pkg/errors"
 	"github.com/xormplus/builder"
@@ -973,17 +972,19 @@ func updateTeacherImport(batchId string, actionPersonId string, actionIp string)
 		//出生日期与性别
 		if model.Sfzjlxm == "1" {
 			//根据身份证号，提取男女，出生日期
-			_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
-			model.Csrq = DateUtil.ConvertDate(birthday)
-			model.Xbm = xbm
+			isValid, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
+			if isValid {
+				model.Csrq = DateUtil.ConvertDate(birthday)
+				model.Xbm = xbm
+			} else {
+				model.Csrq = r1.Csrq
+				model.Xbm = r1.Xbm
+			}
 		} else {
 			//如果不是身份证号，那就用个默认值吧
-			model.Csrq =  DateUtil.ConvertDate("1999-09-01")
+			model.Csrq = DateUtil.ConvertDate("1999-09-01")
 			model.Xbm = r1.Xbm
 		}
-		if r1.Xm == "李爽" {
-			fmt.Println("a")
-		}
 		//排序号
 		//model.SortId = 1 //排序号就不修改了，防止人为修改对了，这样导入再修改回去
 		//学段