From c54b174507a51e971822298b115733c72c0479b4 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 7 Nov 2023 16:00:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UDM=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/udm_user/api_udm_user.go                 |  6 +++---
 features/udm_user/service/service_udm_sub_user.go | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/features/udm_user/api_udm_user.go b/features/udm_user/api_udm_user.go
index a6167517..bb378569 100644
--- a/features/udm_user/api_udm_user.go
+++ b/features/udm_user/api_udm_user.go
@@ -1102,9 +1102,9 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
 	if body.Type == "csv" {
 		// 转换数据
 		data := [][]string{}
-		data = append(data, []string{"imsi", "msisdn", "ambr", "arfb", "sar", "rat", "cn", "smf_sel", "sm_dat", "eps_dat"})
+		data = append(data, []string{"imsi", "msisdn", "ambr", "nssai", "arfb", "sar", "rat", "cn", "smf_sel", "sm_dat", "eps_dat"})
 		for _, v := range list {
-			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
+			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
 		}
 		// 输出到文件
 		err = file.WriterCSVFile(data, filePath)
@@ -1118,7 +1118,7 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
 		// 转换数据
 		data := [][]string{}
 		for _, v := range list {
-			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
+			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
 		}
 		// 输出到文件
 		err = file.WriterTxtFile(data, filePath)
diff --git a/features/udm_user/service/service_udm_sub_user.go b/features/udm_user/service/service_udm_sub_user.go
index 6f02244e..9145c055 100644
--- a/features/udm_user/service/service_udm_sub_user.go
+++ b/features/udm_user/service/service_udm_sub_user.go
@@ -162,8 +162,16 @@ func (r *ServiceUdmSubUser) InsertTxt(neID string, data [][]string) int64 {
 		subUser.Cn = v[7]
 		subUser.SmfSel = v[8]
 		subUser.SmData = v[9]
-		if len(v) == 11 {
-			subUser.EpsDat = v[10]
+		if len(v) > 18 {
+			subUser.EpsFlag = v[10]
+			subUser.EpsOdb = v[11]
+			subUser.HplmnOdb = v[12]
+			subUser.Ard = v[13]
+			subUser.Epstpl = v[14]
+			subUser.ContextId = v[15]
+			subUser.ApnContext = v[17]
+			subUser.StaticIp = v[18]
+			subUser.EpsDat = strings.Join(v[10:], ",")
 		}
 		arr = append(arr, subUser)
 	}