fix

server/ldap-admin/internal/logic/getdepartmentslogic.go

@@ -1,6 +1,8 @@
 package logic
 
 import (
+	"errors"
+	"fmt"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
@@ -40,17 +42,34 @@ func (l *GetDepartmentsLogic) GetDepartments(req *types.Request, userinfo *auth.
 		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "获取部门列表失败")
 	}
 	//变成树形结构
-	list := l.DepartmentListToTree(departList)
+	list, err := l.DepartmentListToTree(departList, false)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error())
+	}
+	fmt.Println(l.SyncDepartmentToLdap())
 	return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetDepartmentsRsp{
 		List: list,
 	})
 }
 
-func (l *GetDepartmentsLogic)DepartmentListToTree(deps []gmodel.LdapDepartment)[]*types.DepartmentsItem{
+// 把列表变成树形结构
+func (l *GetDepartmentsLogic) DepartmentListToTree(deps []gmodel.LdapDepartment, withDepMember bool) ([]*types.DepartmentsItem, error) {
+	var (
+		ldapUserList []gmodel.GetAllUserWithDepartmentRsp
+		err          error
+	)
+	if withDepMember {
+		ldapUserList, err = l.svcCtx.AllModels.LdapUsers.GetAllUserWithDepartment(l.ctx)
+		if err != nil {
+			logx.Error(err)
+			return nil, errors.New("获取全部部门用户失败")
+		}
+	}
 	//存入map
 	mapDepartment := make(map[int64]*types.DepartmentsItem)
 	for _, v := range deps {
-		mapDepartment[v.Id] = &types.DepartmentsItem{
+		data := &types.DepartmentsItem{
 			Id:        v.Id,
 			Name:      *v.Name,
 			Remark:    *v.Remark,
@@ -60,13 +79,28 @@ func (l *GetDepartmentsLogic)DepartmentListToTree(deps []gmodel.LdapDepartment)[
 			SyncState: *v.SyncState,
 			Sort:      *v.Sort,
 			Child:     make([]*types.DepartmentsItem, 0, 50),
+			Members:   nil,
 		}
+		members := make([]types.Member, 0, 100)
+		for _, user := range ldapUserList {
+			if *user.DepartmentId != v.Id {
+				continue
+			}
+			members = append(members, types.Member{
+				Id:       user.Id,
+				Name:     *user.Username,
+				Nickname: *user.Nickname,
+				Email:    *user.Email,
+			})
+		}
+		data.Members = members
+		mapDepartment[v.Id] = data
 	}
 	//组织从属关系
-	for _,v := range mapDepartment{
+	for _, v := range mapDepartment {
 		//如果有父级
-		if parent,ok := mapDepartment[v.ParentId];ok{
-			parent.Child = append(parent.Child,v)
+		if parent, ok := mapDepartment[v.ParentId]; ok {
+			parent.Child = append(parent.Child, v)
 			sort.Slice(parent.Child, func(i, j int) bool {
 				return parent.Child[i].Sort < parent.Child[j].Sort //升序
 			})
@@ -79,6 +113,61 @@ func (l *GetDepartmentsLogic)DepartmentListToTree(deps []gmodel.LdapDepartment)[
 			list = append(list, mapDepartment[v.Id])
 		}
 	}
-	return list
+	return list, nil
 }
 
+// 同步到ldap
+func (l *GetDepartmentsLogic) SyncDepartmentToLdap() error {
+	/*	departList, _, err := l.svcCtx.AllModels.LdapDepartment.GetAll(l.ctx, "sort ASC")
+		if err != nil {
+			return err
+		}
+		//获取所有部门用户
+		ldapUserList, err := l.svcCtx.AllModels.LdapUsers.GetAllUserWithDepartment(l.ctx)
+		if err != nil {
+			return err
+		}
+		for _, v := range departList {
+			err = ildap.Department.Add(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.AdminDN, ildap.DepartmentData{
+				Id:       v.Id,
+				Name:     *v.Name,
+				Remark:   *v.Remark,
+				Type:     *v.Type,
+				ParentId: *v.ParentId,
+				Dn:       *v.Dn,
+			})
+			if err != nil {
+				logx.Error(err)
+				return errors.New("向LDAP同步分组失败")
+			}
+			userList := make([]gmodel.LdapUsers, 0, 100)
+			for _, user := range ldapUserList {
+				if *user.DepartmentId != v.Id {
+					continue
+				}
+				userList = append(userList, user.LdapUsers)
+			}
+			if len(userList) > 0 {
+				for _, user := range userList {
+					if *user.UserDn == l.svcCtx.Config.Ldap.AdminDN {
+						continue
+					}
+					err = ildap.Department.AddUserToGroup(l.svcCtx.Ldap, *v.Dn, *user.UserDn)
+					if err != nil {
+						logx.Error(err)
+						return errors.New("把用户添加到ldap分组失败")
+					}
+				}
+			}
+			//更新的更新状态
+			syncState := int64(1)
+			err = l.svcCtx.AllModels.LdapDepartment.Update(l.ctx, v.Id, &gmodel.LdapDepartment{
+				SyncState: &syncState,
+			})
+			if err != nil {
+				logx.Error(err)
+				return errors.New("更新分组同步状态失败")
+			}
+		}*/
+	return nil
+}