From 8bad9d982e3630351750ebd84abca3dc5097d778 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 14 Dec 2022 10:55:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/issue.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/models/issue.go b/models/issue.go index b943aea79..0161af427 100755 --- a/models/issue.go +++ b/models/issue.go @@ -842,13 +842,20 @@ func (issue *Issue) GetLastEventLabel() string { // GetLastComment return last comment for the current issue. func (issue *Issue) GetCloseUser() (*User, error) { var c Comment - exist, err := x.Where("type = ?", CommentTypeClose). + tmp := CommentTypeClose + if issue.IsPull { + tmp = CommentTypeMergePull + } + exist, err := x.Where("type = ?", tmp). And("issue_id = ?", issue.ID).Desc("id").Get(&c) if err != nil { return nil, err } if !exist { - return nil, nil + if issue.Poster == nil { + issue.LoadPoster() + } + return issue.Poster, nil } err = c.LoadPoster() if c.Poster != nil {