OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: issue of tenant status for all features

Browse Source
This commit is contained in:
simonzhangsz
2024-09-30 16:40:37 +08:00
parent 41693db39e
commit be63431402
13 changed files with 131 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
features/udm_user/repo/repo_udm_sub_user.go
View File

@@ -19,7 +19,7 @@ var NewRepoUdmSubUser = &RepoUdmSubUser{
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`,
left join sys_tenant t on t.tenant_id = s.tenant_id and t.status = 1`,
resultMap: map[string]string{
"id": "ID",
@@ -92,7 +92,7 @@ func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any {
if v, ok := query["tenantName"]; ok && v != "" {
var tenantID []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenant_name='?'", v).Select("tenant_id").Distinct().Find(&tenantID)
Where("tenant_name='?' and status=1", v).Select("tenant_id").Distinct().Find(&tenantID)
if err != nil {
log.Errorf("Find tenant_id err => %v", err)
}
@@ -181,7 +181,7 @@ func (r *RepoUdmSubUser) SelectList(auth model.UdmSubUser) []model.UdmSubUser {
if auth.TenantName != "" {
var tenantID []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenant_name='?'", auth.TenantName).Cols("tenant_id").Distinct().Find(&tenantID)
Where("tenant_name='?' and status=1", auth.TenantName).Cols("tenant_id").Distinct().Find(&tenantID)
if err != nil {
log.Errorf("Find tenant_id err => %v", err)
}
@@ -504,7 +504,7 @@ func (r *RepoUdmSubUser) SetTenantName(subArr *[]model.UdmSubUser) {
for s := 0; s < len(*subArr); s++ {
var tenantName []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenancy_type='IMSI' and tenancy_key='?'", (*subArr)[s].Imsi).Cols("tenant_name").Find(&tenantName)
Where("tenancy_type='IMSI' and tenancy_key='?' and status=1", (*subArr)[s].Imsi).Cols("tenant_name").Find(&tenantName)
if err != nil {
log.Errorf("Find tenant_name err => %v", err)
continue
@@ -519,7 +519,7 @@ func (r *RepoUdmSubUser) SetTenantID(subArr *[]model.UdmSubUser) {
for s := 0; s < len(*subArr); s++ {
var tenantID []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenancy_type='IMSI' and tenancy_key='?'", (*subArr)[s].Imsi).Cols("parent_id").Distinct().Find(&tenantID)
Where("tenancy_type='IMSI' and tenancy_key='?' and status=1", (*subArr)[s].Imsi).Cols("parent_id").Distinct().Find(&tenantID)
if err != nil {
log.Errorf("Find tenant_id err => %v", err)
continue