From 4aa6893d3356e3cdcc6ffc1638d6f8acb076180f Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Sat, 18 Jul 2020 08:21:13 +0800
Subject: [PATCH] 'commit'

---
 .../BaseTeacherDao/BaseTeacherDao.go          | 24 +++++--------------
 .../BaseTeacherService/BaseTeacherService.go  |  4 ++--
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
index a8765f52..11366bf4 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
@@ -167,28 +167,16 @@ func FillLoginInfo(list *[]map[string]interface{}) error {
 		_, ok := _map[record["person_id"].(string)]["login_name"]
 		if ok {
 			record["login_name"] = _map[record["person_id"].(string)]["login_name"].(string)
-		} else {
-			record["login_name"] = "未找到"
-		}
-
-		_, ok = _map[record["person_id"].(string)]["pwd"]
-		if ok {
 			record["pwd"] = _map[record["person_id"].(string)]["pwd"].(string)
-		} else {
-			record["pwd"] = "未找到"
-		}
-		_, ok = _map[record["person_id"].(string)]["original_pwd"]
-		if ok {
 			record["original_pwd"] = _map[record["person_id"].(string)]["original_pwd"].(string)
-		} else {
-			record["original_pwd"] = "未找到"
-		}
-
-		_, ok = _map[record["person_id"].(string)]["b_use"]
-		if ok {
 			record["login_b_use"] = _map[record["person_id"].(string)]["b_use"].(int64)
+
 		} else {
-			record["login_b_use"] = 0
+			record["login_name"] = "未找到"
+			record["pwd"] = "未找到"
+			record["original_pwd"] = "未找到"
+			var i int64 = 0
+			record["login_b_use"] = i
 		}
 	}
 	return nil
diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
index 881ff9ee..4594a5c2 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
@@ -32,8 +32,8 @@ func (s *Rpc) GetBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 	list := SqlKit.QueryByIds([]string{in.PersonId}, "t_base_teacher")
 	//处理从教年月
 	if len(list)>0{
-		if list[0]["csrq"].(string)[0:4]=="1900"{
-			list[0]["csrq"]=""
+		if list[0]["cjny"].(string)[0:4]=="1900"{
+			list[0]["cjny"]=""
 		}
 	}
 	//将结果序列化