From 8c1947efd33848c68d1d3e33b135da182358f494 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 6 Nov 2023 14:44:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UDM=E7=94=A8=E6=88=B7=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/udm_user/repo/repo_udm_auth_user.go | 4 ++--
 features/udm_user/repo/repo_udm_sub_user.go  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/features/udm_user/repo/repo_udm_auth_user.go b/features/udm_user/repo/repo_udm_auth_user.go
index 1f0c63fa..461b2130 100644
--- a/features/udm_user/repo/repo_udm_auth_user.go
+++ b/features/udm_user/repo/repo_udm_auth_user.go
@@ -102,8 +102,8 @@ func (r *RepoUdmAuthUser) SelectPage(query map[string]any) map[string]any {
 		if v == "imsi" {
 			sortSql += " order by imsi "
 		}
-		if v, ok := query["sortOrder"]; ok && v != nil {
-			if v == "desc" {
+		if o, ok := query["sortOrder"]; ok && o != nil && v != "" {
+			if o == "desc" {
 				sortSql += " desc "
 			} else {
 				sortSql += " asc "
diff --git a/features/udm_user/repo/repo_udm_sub_user.go b/features/udm_user/repo/repo_udm_sub_user.go
index d7f5ead9..93a59bc8 100644
--- a/features/udm_user/repo/repo_udm_sub_user.go
+++ b/features/udm_user/repo/repo_udm_sub_user.go
@@ -120,8 +120,11 @@ func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any {
 		if v == "imsi" {
 			sortSql += " order by imsi "
 		}
-		if v, ok := query["sortOrder"]; ok && v != nil {
-			if v == "desc" {
+		if v == "msisdn" {
+			sortSql += " order by msisdn "
+		}
+		if o, ok := query["sortOrder"]; ok && o != nil && v != "" {
+			if o == "desc" {
 				sortSql += " desc "
 			} else {
 				sortSql += " asc "