Merge remote-tracking branch 'origin/main' into multi-tenant

src/modules/network_element/service/ne_info.impl.go

@@ -705,20 +705,30 @@ func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string]
 	}
 
 	n3IPAmdMask := external["upfn3_ip"].(string)
-	n3Arr := strings.Split(n3IPAmdMask, "/")
+	n3Arr := strings.SplitN(n3IPAmdMask, "/", 2)
 	n3IP := n3Arr[0]
-	n3Mask := parse.ConvertIPMask(parse.Number(n3Arr[1]))
+	n3Mask := "255.255.255.0"
+	if len(n3Arr) > 1 {
+		n3Mask = parse.ConvertIPMask(parse.Number(n3Arr[1]))
+	}
 
 	n6IPAmdMask := external["upfn6_ip"].(string)
-	n6Arr := strings.Split(n6IPAmdMask, "/")
+	n6Arr := strings.SplitN(n6IPAmdMask, "/", 2)
 	n6IP := n6Arr[0]
-	n6Mask := parse.ConvertIPMask(parse.Number(n6Arr[1]))
+	n6Mask := "255.255.255.0"
+	if len(n6Arr) > 1 {
+		n6Mask = parse.ConvertIPMask(parse.Number(n6Arr[1]))
+	}
 
 	ueIPAmdMask := external["ue_pool"].(string)
-	ueArr := strings.Split(ueIPAmdMask, "/")
+	ueArr := strings.SplitN(ueIPAmdMask, "/", 2)
 	ueIP := ueArr[0]
-	ueCicr := ueArr[1]
-	ueMask := parse.ConvertIPMask(parse.Number(ueArr[1]))
+	ueCicr := "24"
+	ueMask := "255.255.255.0"
+	if len(ueArr) > 1 {
+		ueCicr = ueArr[1]
+		ueMask = parse.ConvertIPMask(parse.Number(ueArr[1]))
+	}
 
 	return map[string]string{
 		// basic

src/modules/system/controller/sys_profile.go

@@ -60,7 +60,7 @@ func (s *SysProfileController) Info(c *gin.Context) {
 	}
 	isAdmin := config.IsAdmin(loginUser.UserID)
 	if isAdmin {
-		roleGroup = append(roleGroup, i18n.TKey(language, "role.admin"))
+		roleGroup = append(roleGroup, i18n.TKey(language, "role.system"))
 	}
 
 	// 查询用户所属岗位组

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

@@ -282,7 +282,7 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
 	}
 
 	// 构建查询条件语句
-	whereSql := " where u.del_flag = '0' "
+	whereSql := " where u.del_flag = '0' and u.user_id != '1' "
 	if len(conditions) > 0 {
 		whereSql += " and " + strings.Join(conditions, " and ")
 	}