Merge remote-tracking branch 'origin/errcode' into errcode

internal/rpc/group/db_map.go

@@ -51,7 +51,7 @@ func UpdateGroupMemberMap(req *pbGroup.SetGroupMemberInfo) map[string]any {
 		m["nickname"] = req.Nickname.Value
 	}
 	if req.FaceURL != nil {
-		m["face_url"] = req.FaceURL.Value
+		m["user_group_face_url"] = req.FaceURL.Value
 	}
 	if req.RoleLevel != nil {
 		m["role_level"] = req.RoleLevel.Value

internal/rpc/group/group.go

@@ -1032,7 +1032,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 		delete(duplicateMap, [...]string{member.GroupID, member.UserID})
 	}
 	if len(duplicateMap) > 0 {
-		return nil, errs.ErrArgs.Wrap("group not found" + strings.Join(utils.Slice(utils.Keys(duplicateMap), func(e [2]string) string {
+		return nil, errs.ErrArgs.Wrap("user not found" + strings.Join(utils.Slice(utils.Keys(duplicateMap), func(e [2]string) string {
 			return fmt.Sprintf("[group: %s user: %s]", e[0], e[1])
 		}), ","))
 	}
@@ -1067,14 +1067,13 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr
 			return nil, err
 		}
 	}
-	err = s.GroupDatabase.UpdateGroupMembers(ctx, utils.Slice(req.Members, func(e *pbGroup.SetGroupMemberInfo) *relationTb.BatchUpdateGroupMember {
+	if err = s.GroupDatabase.UpdateGroupMembers(ctx, utils.Slice(req.Members, func(e *pbGroup.SetGroupMemberInfo) *relationTb.BatchUpdateGroupMember {
 		return &relationTb.BatchUpdateGroupMember{
 			GroupID: e.GroupID,
 			UserID:  e.UserID,
 			Map:     UpdateGroupMemberMap(e),
 		}
-	}))
-	if err != nil {
+	})); err != nil {
 		return nil, err
 	}
 	for _, member := range req.Members {

pkg/common/db/controller/group.go

@@ -194,6 +194,7 @@ func (g *groupDatabase) PageGroupMember(ctx context.Context, groupIDs []string,
 				}
 				totalGroupMembers = append(totalGroupMembers, groupMembers...)
 			}
+			return uint32(len(totalGroupMembers)), totalGroupMembers, nil
 		} else {
 			for _, groupID := range groupIDs {
 				groupMembers, err := g.cache.GetGroupMembersPage(ctx, groupID, pageNumber, showNumber)
@@ -202,6 +203,7 @@ func (g *groupDatabase) PageGroupMember(ctx context.Context, groupIDs []string,
 				}
 				totalGroupMembers = append(totalGroupMembers, groupMembers...)
 			}
+			return uint32(len(totalGroupMembers)), totalGroupMembers, nil
 		}
 
 	}