marge: 合并代码

2023-11-06 18:16:30 +08:00
parent 970167c76c
commit 13a9b7007b
9 changed files with 206 additions and 21 deletions
--- 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 "