From 5335c5e4539e9b170c0204934459f4a74f44f274 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Fri, 17 Jul 2020 15:56:33 +0800
Subject: [PATCH] 'commit'

---
 .../BaseTeacherDao/BaseTeacherDao.go          | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
index a944f45a..d5b34cc3 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
@@ -163,10 +163,33 @@ func FillLoginInfo(list *[]map[string]interface{}) error {
 	//对原始数据进行扩展
 	for i := range list2 {
 		record := list2[i]
-		record["login_name"] = _map[record["person_id"].(string)]["login_name"].(string)
-		record["pwd"] = _map[record["person_id"].(string)]["pwd"].(string)
-		record["original_pwd"] = _map[record["person_id"].(string)]["original_pwd"].(string)
-		record["login_b_use"] = _map[record["person_id"].(string)]["b_use"].(int64)
+
+		_, 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
+		}
 	}
 	return nil
 }