group

pkg/common/db/controller/group.go

@@ -178,7 +178,10 @@ func (g *groupDatabase) TakeGroupOwner(ctx context.Context, groupID string) (*re
 }
 
 func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) ([]*relationTb.GroupMemberModel, error) {
-	return g.cache.GetGroupMembersInfo(ctx, groupIDs[0], userIDs, roleLevels) // todo cache group find
+	if roleLevels == nil {
+		return g.cache.GetGroupMembersInfo(ctx, groupIDs[0], userIDs, nil)
+	}
+	return g.groupMemberDB.Find(ctx, groupIDs, userIDs, roleLevels)
 }
 
 func (g *groupDatabase) PageGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error) {

pkg/common/db/relation/group_member_model.go

@@ -48,7 +48,7 @@ func (g *GroupMemberGorm) UpdateRoleLevel(ctx context.Context, groupID string, u
 }
 
 func (g *GroupMemberGorm) Find(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) (groupMembers []*relation.GroupMemberModel, err error) {
-	db := g.DB
+	db := g.db(ctx)
 	if len(groupIDs) > 0 {
 		db = db.Where("group_id in (?)", groupIDs)
 	}