From 19f83fdaf56a19fe209ccda9242780b6a613ff95 Mon Sep 17 00:00:00 2001
From: yangwei999 <348134071@qq.com>
Date: Wed, 13 Sep 2023 11:45:44 +0800
Subject: [PATCH] fix mergeable param

---
 cve-vulner-manager/controllers/hook.go  | 2 +-
 cve-vulner-manager/taskhandler/excel.go | 2 +-
 cve-vulner-manager/taskhandler/gauss.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cve-vulner-manager/controllers/hook.go b/cve-vulner-manager/controllers/hook.go
index 803ae7b..662f599 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 d130c0d..43acc94 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 cb32c33..aa612d7 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")
-- 
Gitee