Trustie
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 10
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: 代码回滚

This commit is contained in:
yystopf 2025-07-30 17:36:21 +08:00
parent 6956d94525
commit 0ad284bd5b
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/api/pm/issues_controller.rb
View File

@ -36,10 +36,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
).where.not(id: not_join_id).order(updated_on: :desc)
object_issues = object_issues.where(root_id: nil, child_count: 0) if params[:issue_filter_type] == 'leaf_issue'
object_issues_1 = object_issues.where(pm_issue_type: 1).where.not(status_id: [2,7,8]).to_sql
object_issues_2 = object_issues.where(pm_issue_type: [2,3]).where.not(status_id: [3,5,6]).to_sql
@issues = Issue.from("( #{object_issues_1} union #{object_issues_2}) as issues")
@issues = kaminari_paginate(@issues)
@issues = kaminari_paginate(object_issues)
render 'api/v1/issues/index'
end
@ -49,9 +46,6 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
.where.not(id: Issue.full_children_issues(@issue).map{|i|i.id})
@issues = @issues.where(pm_issue_type: params[:pm_issue_type]) if params[:pm_issue_type].present?
@issues = @issues.ransack(id_or_project_issues_index_eq: params[:keyword]).result.or(@issues.ransack(subject_or_description_cont: params[:keyword]).result) if params[:keyword].present?
issues_1 = @issues.where(pm_issue_type: 1).where.not(status_id: [2,7,8]).to_sql
issues_2 = @issues.where(pm_issue_type:[2,3]).where.not(status_id: [3,5,6]).to_sql
@issues = Issue.from("( #{issues_1} union #{issues_2}) as issues")
@issues = @issues.reorder("#{issue_sort_by} #{issue_sort_direction}")
if params[:only_name].present?
@issues = kaminary_select_paginate(