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

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

@@ -59,26 +59,33 @@ func (l *GetLdapOrganizationMembersLogic) GetLdapOrganizationMembers(req *types.
 	//遍历成员提取cn用于从用户基础组中获取用户信息列表
 	filterBuilder := strings.Builder{}
 	memberCount := 0
-	for _, entry := range result.Entries {
-		if entry.DN != req.OrganizationDN {
+	memberDNList := make([]string, 0, 100)
+	if len(result.Entries) == 0 {
+		return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapOrganizationMembersRsp{
+			List: []types.GetLdapOrganizationMembersItem{},
+		})
+	}
+	teamGroup := result.Entries[0]
+	if teamGroup.DN != req.OrganizationDN {
+		return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapOrganizationMembersRsp{
+			List: []types.GetLdapOrganizationMembersItem{},
+		})
+	}
+	//查到用户信息了
+	for _, attr := range teamGroup.Attributes {
+		if attr.Name != "uniqueMember" {
 			continue
 		}
-		//查到用户信息了
-		for _, attr := range entry.Attributes {
-			if attr.Name != "uniqueMember" {
+		memberCount = len(attr.Values)
+		memberDNList = attr.Values
+		for _, memberDn := range attr.Values {
+			//不需要根用户
+			if memberDn == l.svcCtx.Config.Ldap.RootDN {
 				continue
 			}
-			memberCount = len(attr.Values)
-			for _, memberDn := range attr.Values {
-				//不需要根用户
-				if memberDn == l.svcCtx.Config.Ldap.RootDN {
-					continue
-				}
-				//解析dn成每个小的单元
-				cellList := strings.Split(memberDn, ",") //取cn邮箱
-				filterBuilder.WriteString(fmt.Sprintf("(%s)", cellList[0]))
-			}
-			break
+			//解析dn成每个小的单元
+			cellList := strings.Split(memberDn, ",") //取cn邮箱
+			filterBuilder.WriteString(fmt.Sprintf("(%s)", cellList[0]))
 		}
 		break
 	}
@@ -91,6 +98,7 @@ func (l *GetLdapOrganizationMembersLogic) GetLdapOrganizationMembers(req *types.
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "查询ldap帐号信息失败,"+err.Error())
 	}
 	list := make([]types.GetLdapOrganizationMembersItem, 0, memberCount)
+	mapUser := make(map[string]struct{})
 	for _, user := range userList {
 		if user.Status != 1 {
 			//从部门member中移出
@@ -99,6 +107,7 @@ func (l *GetLdapOrganizationMembersLogic) GetLdapOrganizationMembers(req *types.
 			}
 			continue
 		}
+		mapUser[user.UserDN] = struct{}{}
 		list = append(list, types.GetLdapOrganizationMembersItem{
 			UserId:       user.UserId,
 			UserDN:       user.UserDN,
@@ -110,6 +119,18 @@ func (l *GetLdapOrganizationMembersLogic) GetLdapOrganizationMembers(req *types.
 			Status:       user.Status,
 		})
 	}
+	//成员组成员DN数跟查出来的不一致有可能是帐号被物理删除了，则也把帐号从组织中移除
+	if memberCount != len(userList) {
+		for _, memberDN := range memberDNList {
+			if _, ok := mapUser[memberDN]; ok {
+				continue
+			}
+			//从组织中移除没有帐号的用户
+			if err = l.svcCtx.Ldap.RemoveUserFromOrganization(req.OrganizationDN, memberDN); err != nil {
+				logx.Error("移除用户成员失败!:", err)
+			}
+		}
+	}
 	return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapOrganizationMembersRsp{
 		List: list,
 	})