simonzhangsz/omc_api
1
0
Fork 0
Code Activity

marge: 合并代码

Browse Source
This commit is contained in:
TsMask
2023-11-06 18:16:30 +08:00
parent 970167c76c
commit 13a9b7007b
9 changed files with 206 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
features/udm_user/api_udm_user.go
View File

@@ -607,7 +607,7 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
go s.authUser.InsertTxt(neId, data)
}
}
ctx.JSON(w, 200, result.OkData(data))
ctx.JSON(w, 200, result.OkMsg(data))
}
// UDM签约用户
@@ -1197,5 +1197,5 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
go s.subUser.InsertTxt(neId, data)
}
}
ctx.JSON(w, 200, result.OkData(data))
ctx.JSON(w, 200, result.OkMsg(data))
}

4
features/udm_user/repo/repo_udm_auth_user.go
View File

@@ -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 "

7
features/udm_user/repo/repo_udm_sub_user.go
View File

@@ -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 "