fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
momo 2023-11-15 17:40:52 +08:00
commit e6b8124a72
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/ldap-admin/internal/logic/getdepartmentslogic.go
View File

@ -42,12 +42,11 @@ type DNItem struct {
func (l *GetDepartmentsLogic) GetDepartments(req *types.Request, userinfo *auth.UserInfo) (resp *basic.Response) { func (l *GetDepartmentsLogic) GetDepartments(req *types.Request, userinfo *auth.UserInfo) (resp *basic.Response) {
//从ldap获取组织架构数据 //从ldap获取组织架构数据
// 创建搜索请求
searchRequest := ldap.NewSearchRequest( searchRequest := ldap.NewSearchRequest(
l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.BaseDN, //这里后续需要修改，不同的人只能查询他的下属列表
ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
"(objectClass=*)", //所有object "(objectClass=*)", //所有object
[]string{ /*"cn", "sn", "givenName", "mail", "telephoneNumber", "department", "title"*/ }, nil,
nil, nil,
) )
// 执行搜索请求 // 执行搜索请求
@ -61,13 +60,14 @@ func (l *GetDepartmentsLogic) GetDepartments(req *types.Request, userinfo *auth.
sortNum++ sortNum++
attribute := make(map[string]interface{}) attribute := make(map[string]interface{})
for _, attr := range v.Attributes { for _, attr := range v.Attributes {
//objectcalss属性特别处理
if attr.Name == "objectClass" { if attr.Name == "objectClass" {
mapObjectClass := make(map[string]struct{}) mapObjectClass := make(map[string]struct{})
for _, objectClassItem := range attr.Values { for _, objectClassItem := range attr.Values {
mapObjectClass[objectClassItem] = struct{}{} mapObjectClass[objectClassItem] = struct{}{}
} }
attribute[attr.Name] = mapObjectClass attribute[attr.Name] = mapObjectClass
} else { } else { //普通属性
attribute[attr.Name] = strings.Join(attr.Values, ",") attribute[attr.Name] = strings.Join(attr.Values, ",")
} }
} }