From 02878524707cc6ee89e5aefe3e2a3f540f764eb4 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 24 Sep 2024 10:35:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20SMF=E5=9C=A8=E7=BA=BF=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/controller/smf.go    | 35 +++++++++----------
 src/modules/network_element/fetch_link/smf.go |  4 +--
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/modules/network_data/controller/smf.go b/src/modules/network_data/controller/smf.go
index e0aaf0df..0dc48827 100644
--- a/src/modules/network_data/controller/smf.go
+++ b/src/modules/network_data/controller/smf.go
@@ -293,7 +293,7 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 	}
 
 	// 网元直连
-	data, err := neFetchlink.SMFSubInfo(neInfo, map[string]string{
+	data, err := neFetchlink.SMFSubInfoList(neInfo, map[string]string{
 		"imsi":    query.IMSI,
 		"msisdn":  query.MSISDN,
 		"upstate": query.Upstate,
@@ -306,24 +306,23 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 
 	// 对数据进行处理，去掉前缀，并加入imsi拓展信息
 	rows := data["rows"].([]any)
-	arr := &rows
-	for i := range *arr {
-		item := (*arr)[i].(map[string]any)
-		if v, ok := item["imsi"]; ok && v != nil {
-			imsiStr := v.(string)
-			imsiStr = strings.TrimPrefix(imsiStr, "imsi-")
-			item["imsi"] = imsiStr
-			// 查UDM拓展信息
-			info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "")
-			item["remark"] = info.Remark
-		}
-		if v, ok := item["msisdn"]; ok && v != nil {
-			item["msisdn"] = strings.TrimPrefix(v.(string), "msisdn-")
+	if len(rows) > 0 {
+		arr := &rows
+		for i := range *arr {
+			item := (*arr)[i].(map[string]any)
+			if v, ok := item["imsi"]; ok && v != nil {
+				imsiStr := v.(string)
+				imsiStr = strings.TrimPrefix(imsiStr, "imsi-")
+				item["imsi"] = imsiStr
+				// 查UDM拓展信息
+				info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "")
+				item["remark"] = info.Remark
+			}
+			if v, ok := item["msisdn"]; ok && v != nil {
+				item["msisdn"] = strings.TrimPrefix(v.(string), "msisdn-")
+			}
 		}
 	}
 
-	c.JSON(200, result.Ok(map[string]any{
-		"total": data["total"],
-		"rows":  data["rows"],
-	}))
+	c.JSON(200, result.Ok(data))
 }
diff --git a/src/modules/network_element/fetch_link/smf.go b/src/modules/network_element/fetch_link/smf.go
index c31b6a18..bbbb0ee3 100644
--- a/src/modules/network_element/fetch_link/smf.go
+++ b/src/modules/network_element/fetch_link/smf.go
@@ -10,12 +10,12 @@ import (
 	"be.ems/src/modules/network_element/model"
 )
 
-// SMFSubInfo SMF在线订阅用户列表信息
+// SMFSubInfoList SMF在线订阅用户列表信息
 //
 // 查询参数 {"imsi":"360000100000130","msisdn":"8612300000130","upstate":"Inactive","pageNum":"1"}
 //
 // 返回结果 {"rows":[],"total":0}
-func SMFSubInfo(neInfo model.NeInfo, data map[string]string) (map[string]any, error) {
+func SMFSubInfoList(neInfo model.NeInfo, data map[string]string) (map[string]any, error) {
 	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo", neInfo.IP, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}