From 2829361748fbb2bd5f7499bf6ad170fe06f90599 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 3 Mar 2025 18:06:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=BC=93=E5=AD=98=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/repository/udm_auth.go |  1 -
 src/modules/network_data/repository/udm_sub.go  |  1 -
 src/modules/network_element/service/ne_info.go  | 15 ++++++++++-----
 src/modules/system/repository/sys_menu.go       |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/modules/network_data/repository/udm_auth.go b/src/modules/network_data/repository/udm_auth.go
index 93694628..e8cdb888 100644
--- a/src/modules/network_data/repository/udm_auth.go
+++ b/src/modules/network_data/repository/udm_auth.go
@@ -42,7 +42,6 @@ func (r *UDMAuthUser) SelectPage(query map[string]string) (int64, []model.UDMAut
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		logger.Errorf("total err => %v", err)
 		return total, rows
 	}
 
diff --git a/src/modules/network_data/repository/udm_sub.go b/src/modules/network_data/repository/udm_sub.go
index 8b56a87d..1ec6a71e 100644
--- a/src/modules/network_data/repository/udm_sub.go
+++ b/src/modules/network_data/repository/udm_sub.go
@@ -45,7 +45,6 @@ func (r *UDMSubUser) SelectPage(query map[string]string) (int64, []model.UDMSubU
 
 	// 查询数量 长度为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		logger.Errorf("total err => %v", err)
 		return total, rows
 	}
 
diff --git a/src/modules/network_element/service/ne_info.go b/src/modules/network_element/service/ne_info.go
index 4cc00721..13437225 100644
--- a/src/modules/network_element/service/ne_info.go
+++ b/src/modules/network_element/service/ne_info.go
@@ -86,12 +86,17 @@ func (r NeInfo) ClearNeCacheByNeType(neType string) bool {
 func (r NeInfo) FindByNeType(neType string) []model.NeInfo {
 	neInfo := make([]model.NeInfo, 0)
 	key := fmt.Sprintf("%s:%s:*", constants.CACHE_NE_INFO, strings.ToUpper(neType))
-	jsonStr, _ := redis.Get("", key)
-	if len(jsonStr) > 7 {
-		err := json.Unmarshal([]byte(jsonStr), &neInfo)
-		if err != nil {
-			return neInfo
+	cacheKeys, _ := redis.GetKeys("", key)
+	if len(cacheKeys) > 0 {
+		for _, key := range cacheKeys {
+			var v model.NeInfo
+			jsonStr, _ := redis.Get("", key)
+			if len(jsonStr) > 7 {
+				json.Unmarshal([]byte(jsonStr), &v)
+			}
+			neInfo = append(neInfo, v)
 		}
+		return neInfo
 	} else {
 		neInfo = r.neInfoRepository.SelectList(model.NeInfo{NeType: neType})
 		for _, v := range neInfo {
diff --git a/src/modules/system/repository/sys_menu.go b/src/modules/system/repository/sys_menu.go
index 48972b98..48959ad1 100644
--- a/src/modules/system/repository/sys_menu.go
+++ b/src/modules/system/repository/sys_menu.go
@@ -68,7 +68,7 @@ func (r SysMenu) SelectByIds(menuIds []int64) []model.SysMenu {
 // Insert 新增信息
 func (r SysMenu) Insert(sysMenu model.SysMenu) int64 {
 	sysMenu.DelFlag = "0"
-	if sysMenu.MenuId <= 0 {
+	if sysMenu.MenuId > 0 {
 		return 0
 	}
 	if sysMenu.Icon == "" {