floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-17 18:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into pm_project_develop

Browse Source
This commit is contained in:
yystopf
2024-03-06 08:56:37 +08:00
parent 13e58392dc 1894f00a2d
commit be531eb283
93 changed files with 1914 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/services/api/v1/issues/list_service.rb
View File

@@ -76,10 +76,22 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.where(author_id: author_id) if author_id.present?
# issue_tag_ids
issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(',')).result unless issue_tag_ids.blank?
if issue_tag_ids.present?
if issue_tag_ids.include?('-1')
issues = issues.where(issue_tags_value: nil).or(issues.where(issue_tags_value: ""))
else
issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(',')).result
end
end
# milestone_id
issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present?
if milestone_id.present?
if milestone_id.to_i == -1
issues = issues.where(fixed_version_id: nil)
else
issues = issues.where(fixed_version_id: milestone_id)
end
end
#pm相关
# root_id# -1 查一级目录
@@ -102,7 +114,13 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.where(pm_sprint_id: pm_sprint_id) if pm_sprint_id.present?
# assigner_id
issues = issues.joins(:assigners).where(users: {id: assigner_id}) if assigner_id.present?
if assigner_id.present?
if assigner_id.to_i == -1
issues = issues.left_joins(:assigners).where(users: {id: nil})
else
issues = issues.joins(:assigners).where(users: {id: assigner_id})
end
end
# status_id
issues = issues.where(status_id: status_id) if status_id.present? && category != 'closed'