Merge remote-tracking branch 'origin/main' into lichang

src/modules/network_element/service/ne_info.impl.go

@@ -40,7 +40,7 @@ func (r *NeInfoImpl) SelectNeInfoByNeTypeAndNeID(neType, neID string) model.NeIn
 		}
 	} else {
 		neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID)
-		if neInfo.NeId == neID {
+		if neInfo.ID != "" && neInfo.NeId == neID {
 			redis.Del("", key)
 			values, _ := json.Marshal(neInfo)
 			redis.Set("", key, string(values))
@@ -55,7 +55,7 @@ func (r *NeInfoImpl) RefreshByNeTypeAndNeID(neType, neID string) model.NeInfo {
 	key := fmt.Sprintf("%s%s:%s", cachekey.NE_KEY, strings.ToUpper(neType), neID)
 	redis.Del("", key)
 	neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID)
-	if neInfo.NeId == neID {
+	if neInfo.ID != "" && neInfo.NeId == neID {
 		values, _ := json.Marshal(neInfo)
 		redis.Set("", key, string(values))
 	}