Fix bug

Author: lunny

models/organization/team_repo.go

@@ -10,6 +10,7 @@ import (
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/perm"
 	repo_model "code.gitea.io/gitea/models/repo"
+	"xorm.io/builder"
 )
 
 // TeamRepo represents an team-repository relation.
@@ -39,8 +40,11 @@ type SearchTeamRepoOptions struct {
 func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) ([]*repo_model.Repository, error) {
 	sess := db.GetEngine(ctx)
 	if opts.TeamID > 0 {
-		sess = sess.Join("INNER", "team_repo", "repository.id = team_repo.repo_id").
-			Where("team_repo.team_id=?", opts.TeamID)
+		sess = sess.In("id",
+			builder.Select("repo_id").
+				From("team_repo").
+				Where(builder.Eq{"team_id = ?": opts.TeamID}),
+		)
 	}
 	if opts.PageSize > 0 {
 		sess.Limit(opts.PageSize, opts.Page*opts.PageSize)

models/organization/team_user.go

@@ -47,22 +47,26 @@ type SearchMembersOptions struct {
 func (opts SearchMembersOptions) ToConds() builder.Cond {
 	cond := builder.NewCond()
 	if opts.TeamID > 0 {
-		cond = cond.And(builder.Eq{"team_user.team_id": opts.TeamID})
+		cond = cond.And(builder.Eq{"": opts.TeamID})
 	}
 	return cond
 }
 
 // GetTeamMembers returns all members in given team of organization.
 func GetTeamMembers(ctx context.Context, opts *SearchMembersOptions) ([]*user_model.User, error) {
 	var members []*user_model.User
-	sess := db.GetEngine(ctx).
-		Join("INNER", "team_user", "team_user.uid=user.id").
-		Asc("full_name + name").
-		Where(opts)
+	sess := db.GetEngine(ctx)
+	if opts.TeamID > 0 {
+		sess = sess.In("id",
+			builder.Select("uid").
+				From("team_user").
+				Where(builder.Eq{"team_id = ?": opts.TeamID}),
+		)
+	}
 	if opts.PageSize > 0 && opts.Page > -1 {
 		sess = sess.Limit(opts.PageSize, opts.Page*opts.PageSize)
 	}
-	if err := sess.Find(&members); err != nil {
+	if err := sess.Asc("full_name + name").Find(&members); err != nil {
 		return nil, err
 	}
 	return members, nil