diff --git a/cve-vulner-manager/controllers/file.go b/cve-vulner-manager/controllers/file.go index 9c10a0b52296ee752584f5c5a2430297a42e0783..29c01f436a5112ee90907da0504f8ccdf87b7182 100644 --- a/cve-vulner-manager/controllers/file.go +++ b/cve-vulner-manager/controllers/file.go @@ -410,6 +410,7 @@ func uploadCvrfFile(cvrfFileList map[string][]string, totalFileSlice []string, d saNumber := int64(1000) sfl := models.GetCvrfAllFile() curYears := strconv.Itoa(time.Now().Year()) + var oldyear string saDir := beego.AppConfig.DefaultString("saFileDir", "download/sa") common.CreateAllDir(saDir) if len(sfl) > 0 { @@ -418,11 +419,15 @@ func uploadCvrfFile(cvrfFileList map[string][]string, totalFileSlice []string, d dirYears := curYears if len(fSlice) > 4 { dirYears = fSlice[3] + oldyear = fSlice[3] } totalSlice = append(totalSlice, dirYears+"/"+l.FileName) saNumber = l.SaNumber } } + if len(oldyear) > 0 && curYears > oldyear { + saNumber = int64(1000) + } // File name and data stored in database fileSlice, fOk := cvrfFileList[taskhandler.CVRFFKEY] if fOk { diff --git a/cve-vulner-manager/models/cve.go b/cve-vulner-manager/models/cve.go index f161ca72b3a24a227619d146ba3fd8860464cf65..7edfbca54ef2ff47da59974adb9cb0a298810935 100644 --- a/cve-vulner-manager/models/cve.go +++ b/cve-vulner-manager/models/cve.go @@ -1109,8 +1109,8 @@ is_export in (0,3) and pack_name in ('%s') and organizate_id = 1) and status < 4 func GetUnffectIssueNumber(startTime string, cves []string) (issueTemp []IssueTemplate, err error) { var sql string if len(cves) == 0 { - sql = `SELECT * FROM cve_issue_template WHERE cve_id IN (SELECT DISTINCT cve_id FROM cve_vuln_center WHERE cve_status = 2 AND -is_export IN (0,3) and organizate_id = 1) AND create_time >= '%s' AND status < 4` + sql = `SELECT * FROM cve_issue_template WHERE STATUS = 3 AND issue_status in (2,6) AND cve_id IN (SELECT DISTINCT cve_id FROM cve_vuln_center WHERE cve_status = 2 AND +is_export IN (0,3) and organizate_id = 1) AND create_time >= '%s'` } else { var s string for _, v := range cves { @@ -1119,8 +1119,8 @@ is_export IN (0,3) and organizate_id = 1) AND create_time >= '%s' AND status < 4 if len(s) > 1 { s = s[:len(s)-1] } - sql = `SELECT * FROM cve_issue_template WHERE cve_id IN (SELECT DISTINCT cve_id FROM cve_vuln_center WHERE cve_status = 2 AND -is_export IN (0,3) and organizate_id = 1) AND create_time >= '%s' AND status < 4` + ` AND cve_num in (` + s + `)` + sql = `SELECT * FROM cve_issue_template WHERE STATUS = 3 AND issue_status in (2,6) AND cve_id IN (SELECT DISTINCT cve_id FROM cve_vuln_center WHERE cve_status = 2 AND +is_export IN (0,3) and organizate_id = 1) AND create_time >= '%s' ` + ` AND cve_num in (` + s + `)` } sql = fmt.Sprintf(sql, startTime)