From 1bdb6dad9831b988cb367c361caada3e40ef9108 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 4 Dec 2023 09:59:25 +0800 Subject: [PATCH] =?UTF-8?q?issue=E6=8C=89id=E9=9B=86=E5=90=88=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E9=80=89=E6=8B=A9=E5=85=B3=E8=81=94issue?= =?UTF-8?q?=E6=97=B6=E6=8E=92=E9=99=A4=E5=B7=B2=E9=80=89id=E9=9B=86?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/issues_controller.rb | 2 -- app/services/api/v1/issues/list_service.rb | 11 +++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index 8ad0760fc..3055dfabe 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -29,8 +29,6 @@ class Api::Pm::IssuesController < Api::Pm::BaseController @issue.pm_links.pluck(:be_linkable_id) end - not_join_id = params[:exclude_ids].to_s.split(",") if params[:exclude_ids].present? - not_join_id << @issue.id object_issues = Issue.where( pm_project_id: params[:pm_project_id], diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index bc098bfbe..13f9e9842 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -76,9 +76,6 @@ class Api::V1::Issues::ListService < ApplicationService # milestone_id issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present? - # ids - issues = issues.where(id: params[:ids].to_s.split(",")) if params[:ids].present? - #pm相关 # root_id# -1 查一级目录 issues = if root_id.to_i == -1 @@ -105,7 +102,13 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.where(status_id: status_id) if status_id.present? && category != 'closed' # status_ids - issues = issues.where(status_id: status_ids) unless status_ids.blank? + issues = issues.where(status_id: status_ids) unless status_ids.blank? + + # ids + issues = issues.where(id: params[:ids].to_s.split(",")) if params[:ids].present? + + # exclude_ids + issues = issues.where.not(id: params[:exclude_ids].to_s.split(",")) if params[:exclude_ids].present? if begin_date&.present? || end_date&.present? issues = issues.where('issues.created_on between ? and ?', begin_date&.present? ? begin_date.to_time : Time.now.beginning_of_day, end_date&.present? ? end_date.to_time.end_of_day : Time.now.end_of_day)