From bf0a40aa6cccb944b6af16f09aded55a90782799 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Thu, 6 Aug 2020 13:30:35 +0800 Subject: [PATCH] 'commit' --- .../BaseTeacher/BaseTeacherDao/BaseTeacherDao.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go index a6fbdc38..e3bb49a6 100644 --- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go +++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go @@ -175,7 +175,7 @@ func FillMainBureauOrgInfo(list2 *[]map[string]interface{}) { for i := range list { personIds = append(personIds, (list[i])["person_id"].(string)) } - var myBuilder = builder.Dialect(builder.MYSQL).Select("person_id,bureau_id,org_id,provice_code,city_code,district_code,main_school_id"). + var myBuilder = builder.Dialect(builder.MYSQL).Select("person_id,bureau_id,org_id,province_code,city_code,district_code,main_school_id"). From("t_base_teacher_org"). Where(builder.In("person_id", personIds)).And(builder.Eq{"b_use": 1}). And(builder.Eq{"is_main": 1}) @@ -185,13 +185,13 @@ func FillMainBureauOrgInfo(list2 *[]map[string]interface{}) { for i := range list { for j := range _listExtendInfo { - if _listExtendInfo[j]["person_id"].(string) == list[i]["person_id"].(string) { - list[i]["x_bureau_id"] = _listExtendInfo[j]["bureau_id"].(string) - list[i]["x_org_id"] = _listExtendInfo[j]["org_id"].(string) - list[i]["x_provice_code"] = _listExtendInfo[j]["provice_code"].(string) - list[i]["x_city_code"] = _listExtendInfo[j]["city_code"].(string) - list[i]["x_district_code"] = _listExtendInfo[j]["district_code"].(string) - list[i]["x_main_school_id"] = _listExtendInfo[j]["main_school_id"].(string) + 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_provice_code"] = _listExtendInfo[j]["provice_code"] + list[i]["x_city_code"] = _listExtendInfo[j]["city_code"] + list[i]["x_district_code"] = _listExtendInfo[j]["district_code"] + list[i]["x_main_school_id"] = _listExtendInfo[j]["main_school_id"] break } }