floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

修复：合并请求查询关闭类型须根据合并请求类型查询

This commit is contained in:
yystopf 2022-11-16 15:27:49 +08:00
parent ea7cf1cd1f
commit e183f48c02
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/issues/list_query_service.rb
View File

@ -17,7 +17,11 @@ class Issues::ListQueryService < ApplicationService
issues = all_issues.issue_index_includes issues = all_issues.issue_index_includes
issues = issues.includes(pull_request: :reviewers) issues = issues.includes(pull_request: :reviewers)
if status_type.to_s == "2" #表示关闭中的 if status_type.to_s == "2" #表示关闭中的
issues = issues.where(status_id: 5) if(select_type == "Issue")
issues = issues.where(status_id: 5)
else
issues = issues.joins(:pull_request).where(pull_requests: {status: 2})
end
elsif status_type.to_s == "1" elsif status_type.to_s == "1"
if(select_type == "Issue") if(select_type == "Issue")
issues = issues.where.not(status_id: 5) #默认显示开启中的 issues = issues.where.not(status_id: 5) #默认显示开启中的