Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
“xxq250” 2022-11-23 17:07:59 +08:00
commit 667dca0553
1 changed files with 5 additions and 1 deletions
app/services/issues

View File

@ -17,7 +17,11 @@ class Issues::ListQueryService < ApplicationService
issues = all_issues.issue_index_includes
issues = issues.includes(pull_request: :reviewers)
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"
if(select_type == "Issue")
issues = issues.where.not(status_id: 5) #默认显示开启中的