add: multi-tenancy

src/modules/network_element/model/udm_sub.go

@@ -24,6 +24,7 @@ type UDMSub struct {
 	ContextId  string `json:"contextId" gorm:"column:context_id"`
 	ApnContext string `json:"apnContext" gorm:"column:apn_context"`
 	StaticIp   string `json:"staticIp" gorm:"column:static_ip"`
+	TenantID   string `json:"tenantID" gorm:"column:tenant_id"`
 	TenantName string `json:"tenantName" gorm:"column:tenant_name"`
 
 	// ====== 非数据库字段属性 ======

src/modules/network_element/repository/udm_sub.impl.go

@@ -1,7 +1,6 @@
 package repository
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
@@ -15,9 +14,11 @@ import (
 // 实例化数据层 UDMSubImpl 结构体
 var NewUDMSubImpl = &UDMSubImpl{
 	selectSql: `select 
-	id, msisdn, imsi, ambr, nssai, rat, arfb, sar, cn, sm_data, smf_sel, eps_dat, ne_id, eps_flag, eps_odb, hplmn_odb, ard, epstpl, context_id, apn_context, static_ip,
-	tenant_name
-	from u_sub_user`,
+	s.id, s.msisdn, s.imsi, s.ambr, s.nssai, s.rat, s.arfb, s.sar, s.cn, s.sm_data, s.smf_sel, s.eps_dat, 
+	s.ne_id, s.eps_flag, s.eps_odb, s.hplmn_odb, s.ard, s.epstpl, s.context_id, s.apn_context, s.static_ip,
+	t.tenant_id, t.tenant_name
+	from u_sub_user s 
+	left join sys_tenant t on t.tenant_id = s.tenant_id`,
 
 	resultMap: map[string]string{
 		"id":          "ID",
@@ -41,6 +42,7 @@ var NewUDMSubImpl = &UDMSubImpl{
 		"context_id":  "ContextId",
 		"apn_context": "ApnContext",
 		"static_ip":   "StaticIp",
+		"tenant_id":   "TenantID",
 		"tenant_name": "TenantName", // Tenant name for multi-tenancy
 	},
 }
@@ -97,11 +99,11 @@ func (r *UDMSubImpl) SelectPage(query map[string]any) map[string]any {
 		params = append(params, v)
 	}
 	// for multi-tenancy solution
-	if v, ok := query["tenantName"]; ok && v != "" {
-		conditions = append(conditions, "tenant_name = ?")
-		params = append(params, v)
-		fmt.Printf("tenantName = %s", v)
-	}
+	// if v, ok := query["tenantName"]; ok && v != "" {
+	// 	conditions = append(conditions, "tenant_name = ?")
+	// 	params = append(params, v)
+	// 	fmt.Printf("tenantName = %s", v)
+	// }
 
 	// 构建查询条件语句
 	whereSql := ""

src/modules/system/repository/sys_tenant.impl.go

@@ -15,7 +15,8 @@ import (
 // 实例化数据层 SysTenantImpl 结构体
 var NewSysTenantImpl = &SysTenantImpl{
 	selectSql: `select 
-	t.tenant_id, t.parent_id, t.ancestors, t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status, t.del_flag, t.create_by, t.create_time 
+	t.tenant_id, t.parent_id, t.ancestors, t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status, 
+	t.del_flag, t.create_by, t.create_time 
 	from sys_tenant t`,
 
 	resultMap: map[string]string{