From f838ce4a0c82cb59fcb4ced447e979e2ad089d2a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 11 Dec 2024 17:22:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94issue=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/issues_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index ce0981a89..19ab28435 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -246,7 +246,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController compare_link_issues_ids = children_issues.pluck(:id) | linkable_issues.pluck(:id) | belinkable_issues.pluck(:id) i = compare_link_issues_ids.count while i > 0 do - children_issues = Issue.where(root_id: compare_link_issues_ids).where.not(pm_issue_type: 1) + children_issues = Issue.where(root_id: compare_link_issues_ids) linkable_issues = Issue.where(id: PmLink.where(linkable_type: "Issue", linkable_id: compare_link_issues_ids).pluck(:be_linkable_id)) belinkable_issues = Issue.where(id: PmLink.where(be_linkable_type: "Issue", be_linkable_id: compare_link_issues_ids).pluck(:linkable_id)) @@ -254,6 +254,10 @@ class Api::Pm::IssuesController < Api::Pm::BaseController full_link_issues_ids = full_link_issues_ids | compare_link_issues_ids i = compare_link_issues_ids.count end + exclude_issues_array = Issue.where(id: full_link_issues_ids).where.not(root_id: nil).pluck(:id, :root_id) + exclude_issues_array.each do |i| + full_link_issues_ids - [i[0]] if full_link_issues_ids.include?(i[1]) + end @requirement_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:1).pm_includes @task_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:2).pm_includes