From f4d939447e41bccfe72fac27cb13450e5f1879aa Mon Sep 17 00:00:00 2001
From: zhangjianjun <wusen@126.com>
Date: Sat, 26 Feb 2022 10:40:46 +0800
Subject: [PATCH 1/2] When the CVE of the data from the vtopia system maintains
 strong version consistency

---
 cve-vulner-manager/taskhandler/cve.go | 32 ++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go
index 0a5694b..5152659 100644
--- a/cve-vulner-manager/taskhandler/cve.go
+++ b/cve-vulner-manager/taskhandler/cve.go
@@ -1072,8 +1072,16 @@ func AddOrDataToCenter(repoNme, packageName, cveRef, scopeType, value string, cv
 	CveRes, err := models.QueryCveByNum(cveData.CveNum, repoNme, organizationID)
 	if err {
 		CveRes.RepoName = packageName
-		retVersion := AddCveVersion(organizationID, versionList, CveRes.CveVersion)
-		pkList = append(pkList, retVersion)
+		if CveRes.DataSource == 1 {
+			retVersion := " "
+			if len(versionList) > 0 {
+				retVersion = strings.Join(versionList, ",")
+			}
+			pkList = append(pkList, retVersion)
+		} else {
+			retVersion := AddCveVersion(organizationID, versionList, CveRes.CveVersion)
+			pkList = append(pkList, retVersion)
+		}
 		lockx.Lock()
 		ok, err := UpdateCveGroups(cveData, cveRef, openeulerNum, CveRes, cveDesc, cveScV3, goe,
 			scopeType, cveScV2, pkList, organizationID)
@@ -1085,7 +1093,11 @@ func AddOrDataToCenter(repoNme, packageName, cveRef, scopeType, value string, cv
 		}
 	} else {
 		retVersion := AddCveVersion(organizationID, versionList, "")
-		pkList = append(pkList, retVersion)
+		if len(retVersion) > 0 {
+			pkList = append(pkList, retVersion)
+		} else {
+			pkList = append(pkList, " ")
+		}
 		lockx.Lock()
 		ok, err := InsertCveGroups(cveData, cveRef, repoNme, openeulerNum, cveDesc, cveScV3, goe,
 			scopeType, cveScV2, pkList, organizationID)
@@ -1162,6 +1174,20 @@ func AddCveVersion(organizationID int8, versionList []string, cveVersion string)
 			retVersion = strings.Join(eulerSlice, ",")
 		}
 	}
+	if len(retVersion) > 0 {
+		verList := make([]string, 0)
+		tmpVer := strings.Split(retVersion, ",")
+		for _, ver := range tmpVer {
+			if len(ver) > 0 && ver != " " {
+				verList = append(verList, ver)
+			}
+		}
+		if len(verList) > 0 {
+			retVersion = strings.Join(verList, ",")
+		} else {
+			retVersion = ""
+		}
+	}
 	if len(retVersion) > 0 && retVersion[0] == ',' {
 		retVersion = retVersion[1:]
 	}
-- 
Gitee


From cae9eb28245931493bfd1eecfac91b602bc6c588 Mon Sep 17 00:00:00 2001
From: zhangjianjun <wusen@126.com>
Date: Sat, 26 Feb 2022 10:45:41 +0800
Subject: [PATCH 2/2] When the CVE of the data from the vtopia system maintains
 strong version consistency

---
 cve-vulner-manager/taskhandler/cve.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go
index 5152659..acc0a9d 100644
--- a/cve-vulner-manager/taskhandler/cve.go
+++ b/cve-vulner-manager/taskhandler/cve.go
@@ -1185,7 +1185,7 @@ func AddCveVersion(organizationID int8, versionList []string, cveVersion string)
 		if len(verList) > 0 {
 			retVersion = strings.Join(verList, ",")
 		} else {
-			retVersion = ""
+			retVersion = " "
 		}
 	}
 	if len(retVersion) > 0 && retVersion[0] == ',' {
-- 
Gitee