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

fix: merge issue

Browse Source
This commit is contained in:
simonzhangsz
2024-06-28 14:34:09 +08:00
parent 2aeaffb48f
commit ff9ada0676
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/upgrade/upg_sys_role.sql
View File

@@ -5,6 +5,6 @@ INSERT IGNORE INTO `sys_role` VALUES (2, 'role.adminAssign', 'administrator', 2,
INSERT IGNORE INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'supervisor', 1698486934900, 'supervisor', 1717143582784, 'role.operatorRemark');
INSERT IGNORE INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'supervisor', 1698486950714, 'supervisor', 1706774389300, 'role.monitorRemark');
INSERT IGNORE INTO `sys_role` VALUES (5, 'role.vistor', 'vistor', 5, '1', '1', '1', '1', '0', 'supervisor', 1698486975779, 'supervisor', 1706774405096, 'role.vistorRemark');
INSERT IGNORE INTO `sys_role` (`role_id`, `role_name`, `role_key`, `role_sort`, `data_scope`, `menu_check_strictly`, `dept_check_strictly`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (100, 'role.tenant', 'tenant', 100, '2', '1', '1', '1', '0', 'admin', 1715591950609, 'supervisor', 1718701342318, '');
INSERT IGNORE INTO `sys_role` VALUES (100, 'role.tenant', 'tenant', 100, '2', '1', '1', '1', '0', 'admin', 1715591950609, 'supervisor', 1718701342318, '');
SET FOREIGN_KEY_CHECKS=1;

6
src/modules/network_data/repository/udm_sub.impl.go
View File

@@ -79,6 +79,8 @@ func (r *UDMSubImpl) ClearAndInsert(neID string, u []model.UDMSub) int64 {
if err != nil {
logger.Errorf("TRUNCATE err => %v", err)
}
// multi-tenancy
r.SetTenantID(&u)
return r.Inserts(u)
}
@@ -250,9 +252,9 @@ func (r *UDMSubImpl) DeletePrefixByIMSI(neId, imsi string) int64 {
func (r *UDMSubImpl) SetTenantID(subArr *[]model.UDMSub) {
for s := 0; s < len(*subArr); s++ {
var tenantID []string
err := datasource.DefaultDB().Table("sys_tenant").
err := dborm.DefaultDB().Table("sys_tenant").
Where("status='1' and tenancy_type='IMSI' and ? like tenancy_key", (*subArr)[s].IMSI).
Select("parent_id").Distinct().Find(&tenantID)
Cols("parent_id").Distinct().Find(&tenantID)
if err != nil {
logger.Errorf("Find tenant_id err => %v", err)
continue