diff --git a/cve-vulner-manager/controllers/hook.go b/cve-vulner-manager/controllers/hook.go index 803ae7bae2fd2282a6a11bdf5d8c5ef71549f589..662f59988d933f0df1f1f3bb7ca29964efc916f4 100644 --- a/cve-vulner-manager/controllers/hook.go +++ b/cve-vulner-manager/controllers/hook.go @@ -987,7 +987,7 @@ func getRepoIssueAllPR(affectBranch []string, token, owner, repo string, isTemp if _, ok := v["id"]; !ok { continue } - if v["state"].(string) == "merged" && v["mergeable"].(bool) { + if v["state"].(string) == "merged" { if v["base"].(map[string]interface{})["label"].(string) == brh { pr.Id = int64(v["id"].(float64)) pr.Number = isTemp.IssueNum diff --git a/cve-vulner-manager/taskhandler/excel.go b/cve-vulner-manager/taskhandler/excel.go index d130c0d83b47f6a45a54dd79de35ce3ea33318a3..43acc94b14f3ca45e9fa482b4cd5fa4b3d42921b 100644 --- a/cve-vulner-manager/taskhandler/excel.go +++ b/cve-vulner-manager/taskhandler/excel.go @@ -1353,7 +1353,7 @@ func getRepoIssueAllPR(affectBranch, token, owner, repo string, startTime, continue } pr := models.PullRequestIssue{} - if v["state"].(string) == "merged" && v["mergeable"].(bool) { + if v["state"].(string) == "merged" { //mt := v["closed_at"].(string).(time.Time).Local().Unix() closedAt := v["closed_at"].(string) mt := util.TimeStrToInt(closedAt[:19], "2006-01-02T15:04:05") diff --git a/cve-vulner-manager/taskhandler/gauss.go b/cve-vulner-manager/taskhandler/gauss.go index cb32c33948c4e05ce4bd8bb8aad44c8fd9c5b3ed..aa612d782c00e5fc348e72bbd9854bbdb60a8d6a 100644 --- a/cve-vulner-manager/taskhandler/gauss.go +++ b/cve-vulner-manager/taskhandler/gauss.go @@ -812,7 +812,7 @@ func getGaussRepoIssueAllPR(affectBranch, token, owner, repo string, startTime, continue } pr := models.PullRequestIssue{} - if v["state"].(string) == "merged" && v["mergeable"].(bool) { + if v["state"].(string) == "merged" { //mt := v["closed_at"].(string).(time.Time).Local().Unix() closedAt := v["closed_at"].(string) mt := util.TimeStrToInt(closedAt[:19], "2006-01-02T15:04:05")