From 82b771ee1f99033f5f7c3c0de8c04bbf15594a27 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 15 Nov 2024 19:48:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=9F=E6=88=B7=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAUDM=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network_data/controller/udm_sub.go        | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/modules/network_data/controller/udm_sub.go b/src/modules/network_data/controller/udm_sub.go
index e8617139..2272e9a5 100644
--- a/src/modules/network_data/controller/udm_sub.go
+++ b/src/modules/network_data/controller/udm_sub.go
@@ -54,7 +54,17 @@ func (s *UDMSubController) ResetData(c *gin.Context) {
 // GET /list
 func (s *UDMSubController) List(c *gin.Context) {
 	querys := ctx.QueryMap(c)
-	querys["userName"] = ctx.LoginUserToUserName(c)
+	// querys["userName"] = ctx.LoginUserToUserName(c)
+	// 判断租户角色
+	loginUser, _ := ctx.LoginUser(c)
+	if len(loginUser.User.Roles) > 0 {
+		for _, v := range loginUser.User.Roles {
+			if v.RoleKey == "tenant" {
+				querys["tenantName"] = loginUser.User.UserName
+				break
+			}
+		}
+	}
 	data := s.udmSubService.SelectPage(querys)
 	c.JSON(200, result.Ok(data))
 }
@@ -368,6 +378,17 @@ func (s *UDMSubController) Export(c *gin.Context) {
 		return
 	}
 
+	// 判断租户角色
+	loginUser, _ := ctx.LoginUser(c)
+	if len(loginUser.User.Roles) > 0 {
+		for _, v := range loginUser.User.Roles {
+			if v.RoleKey == "tenant" {
+				querys["tenantName"] = loginUser.User.UserName
+				break
+			}
+		}
+	}
+
 	querys["pageNum"] = 1
 	querys["pageSize"] = 10000
 	data := s.udmSubService.SelectPage(querys)