merge: main to multi-tenant

src/modules/network_data/controller/all_kpi.go

@@ -1,6 +1,9 @@
 package controller
 
 import (
+	"fmt"
+
+	"be.ems/src/framework/datasource"
 	"be.ems/src/framework/i18n"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/utils/date"
@@ -62,7 +65,6 @@ func (s *PerfKPIController) GoldKPI(c *gin.Context) {
 			return
 		}
 		querys.RmUID = neInfo.RmUID
-		log.Tracef("neInfo.RmUID=%s", neInfo.RmUID)
 	} else { // tenant, useName -> tenantID
 		var userName, rmUID string
 		userName = ctx.LoginUserToUserName(c)
@@ -74,16 +76,15 @@ func (s *PerfKPIController) GoldKPI(c *gin.Context) {
 		// multi-tenancy, useName->tenantID->rmUID
 		selectSQL := fmt.Sprintf(`SELECT t.tenancy_key FROM sys_tenant t WHERE t.status='1' AND t.tenancy_type='UPF' AND t.parent_id = 
 			(SELECT u.tenant_id FROM sys_user u WHERE u.user_name='%s')`, userName)
-		_, err := datasource.DefaultDB().SQL(selectSQL).Cols("rm_uid").Get(&rmUID)
+		err := datasource.DefaultDB().Raw(selectSQL).Scan(&rmUID).Error
 		if err != nil {
-			c.JSON(200, result.ErrMsgFmt("DB Get error: %s", err.Error()))
+			c.JSON(200, result.ErrMsgFmt("DB Get error: %v", err))
 			return
 		} else if rmUID == "" {
 			c.JSON(200, result.ErrMsgFmt("NOT FOUND target NE"))
 			return
 		}
 		querys.RmUID = rmUID
-		log.Tracef("rmUID=%s", rmUID)
 	}
 
 	// 查询数据

src/modules/network_data/controller/udm_sub.go

@@ -60,7 +60,7 @@ func (s *UDMSubController) List(c *gin.Context) {
 	querys := ctx.QueryMap(c)
 	querys["neId"] = ""
 	querys["userName"] = ctx.LoginUserToUserName(c)
-	data := s.udmSubService.Page(querys)
+	data := s.udmSubService.SelectPage(querys)
 	c.JSON(200, result.Ok(data))
 }