|
|
|
@ -130,10 +130,38 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
|
|
|
|
|
FillLoginInfo(&list)
|
|
|
|
|
//对于教师是不是修改过账号进行判断
|
|
|
|
|
SysLoginpersonService.FillPwdIsChange(&list)
|
|
|
|
|
//扩展是不是在多个单位+部门下
|
|
|
|
|
FillIsMutliOrg(&list)
|
|
|
|
|
//返回结果
|
|
|
|
|
return list, count, err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
功能:填充一个人员在几个部门下
|
|
|
|
|
作者:黄海
|
|
|
|
|
时间:2020-08-05
|
|
|
|
|
*/
|
|
|
|
|
func FillIsMutliOrg(list2 *[]map[string]interface{}) {
|
|
|
|
|
list := *list2
|
|
|
|
|
var personIds = make([]string, 0)
|
|
|
|
|
for i := range list {
|
|
|
|
|
personIds = append(personIds, (list[i])["person_id"].(string))
|
|
|
|
|
}
|
|
|
|
|
var myBuilder = builder.Dialect(builder.MYSQL).Select("person_id,count(*) as c").
|
|
|
|
|
From("t_base_teacher_org").Where(builder.In("person_id", personIds)).And(builder.Eq{"b_use": 1}).
|
|
|
|
|
GroupBy("person_id")
|
|
|
|
|
sql, _ := myBuilder.ToBoundSQL()
|
|
|
|
|
_list, _ := db.SQL(sql).Query().List()
|
|
|
|
|
//生成map
|
|
|
|
|
var _map = make(map[string]int64, 0)
|
|
|
|
|
for i := range _list {
|
|
|
|
|
_map[_list[i]["person_id"].(string)] = _list[i]["c"].(int64)
|
|
|
|
|
}
|
|
|
|
|
for i := range list {
|
|
|
|
|
list[i]["org_count"] = _map[list[i]["person_id"].(string)]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
功能:扩展登录信息
|
|
|
|
|
作者:黄海
|
|
|
|
|