From 54c874be1f1bd42a4962c657ddf0d8e71809014f Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Tue, 25 Apr 2023 07:14:35 +0000
Subject: [PATCH 1/3] fix

---
 routers/web/org/teams.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index bae8e5a003c60..683ab040c0c21 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -86,9 +86,16 @@ func TeamsAction(ctx *context.Context) {
 				return
 			}
 		}
+
+		redirect := ctx.Org.OrgLink + "/teams/"
+		if isOrgMember, err := org_model.IsOrganizationMember(ctx, ctx.Org.Organization.ID, ctx.Doer.ID); err != nil {
+			ctx.ServerError("IsOrganizationMember", err)
+		} else if !isOrgMember {
+			redirect = setting.AppURL
+		}
 		ctx.JSON(http.StatusOK,
 			map[string]interface{}{
-				"redirect": ctx.Org.OrgLink + "/teams/",
+				"redirect": redirect,
 			})
 		return
 	case "remove":

From e7c432ca7cebf17efdb3bc5a09565f01fe18c8c0 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Tue, 25 Apr 2023 07:19:30 +0000
Subject: [PATCH 2/3] add return

---
 routers/web/org/teams.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index 683ab040c0c21..79371b8c3c568 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -90,6 +90,7 @@ func TeamsAction(ctx *context.Context) {
 		redirect := ctx.Org.OrgLink + "/teams/"
 		if isOrgMember, err := org_model.IsOrganizationMember(ctx, ctx.Org.Organization.ID, ctx.Doer.ID); err != nil {
 			ctx.ServerError("IsOrganizationMember", err)
+			return
 		} else if !isOrgMember {
 			redirect = setting.AppURL
 		}

From 2b2f13660460417f523eb6079af9a56360688c38 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Wed, 26 Apr 2023 01:05:04 +0000
Subject: [PATCH 3/3] use AppSubURL

---
 routers/web/org/teams.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index 79371b8c3c568..2ce4bf5322717 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -92,7 +92,7 @@ func TeamsAction(ctx *context.Context) {
 			ctx.ServerError("IsOrganizationMember", err)
 			return
 		} else if !isOrgMember {
-			redirect = setting.AppURL
+			redirect = setting.AppSubURL + "/"
 		}
 		ctx.JSON(http.StatusOK,
 			map[string]interface{}{