From 0ad284bd5bbaf2ec726dbedc1a895e100dbbbbf5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 30 Jul 2025 17:36:21 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=20=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/issues_controller.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index 579279c3c..8a2a81585 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -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(