Browse Source

新增:issue列表查询企业标识以及移除pm_project_id验证

pull/348/head^2^2
yystopf 1 year ago
parent
commit
6574ee5270
3 changed files with 5 additions and 3 deletions
  1. +1
    -1
      app/controllers/api/pm/base_controller.rb
  2. +1
    -1
      app/controllers/api/pm/issues_controller.rb
  3. +3
    -1
      app/services/api/v1/issues/list_service.rb

+ 1
- 1
app/controllers/api/pm/base_controller.rb View File

@@ -30,7 +30,7 @@ class Api::Pm::BaseController < ApplicationController
end

def load_issue
return render_parameter_missing if params[:pm_project_id].blank?
# return render_parameter_missing if params[:pm_project_id].blank?
@issue = Issue.issue_issue.where(pm_project_id: params[:pm_project_id]).find_by_id(params[:issue_id])
render_not_found('疑修不存在!') if @issue.blank?
end


+ 1
- 1
app/controllers/api/pm/issues_controller.rb View File

@@ -322,7 +322,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
:update_begin_date, :update_end_date,
:sort_by, :sort_direction, :root_id,
:issue_tag_ids, :pm_project_id, :pm_sprint_id, :pm_issue_type, :pm_project_ids,
:status_ids, :ids, :exclude_ids, :pm_issue_types, :participator_id
:status_ids, :ids, :exclude_ids, :pm_issue_types, :participator_id, :enterprise_identifier
)
end



+ 3
- 1
app/services/api/v1/issues/list_service.rb View File

@@ -3,7 +3,7 @@ class Api::V1::Issues::ListService < ApplicationService

attr_reader :project, :only_name, :category, :participant_category, :keyword, :author_id, :issue_tag_ids
attr_reader :begin_date, :end_date, :update_begin_date, :update_end_date
attr_reader :milestone_id, :assigner_id, :status_id, :priority_id, :sort_by, :sort_direction, :current_user
attr_reader :milestone_id, :assigner_id, :status_id, :priority_id, :sort_by, :sort_direction, :current_user, :enterprise_identifier
attr_reader :pm_project_id, :pm_project_ids, :pm_sprint_id, :root_id, :pm_issue_type, :status_ids, :ids, :exclude_ids, :pm_issue_types
attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count, :complete_issues_count, :participator

@@ -30,6 +30,7 @@ class Api::V1::Issues::ListService < ApplicationService
@update_begin_date = params[:update_begin_date]
@update_end_date = params[:update_end_date]
@sort_by = params[:sort_by].present? ? params[:sort_by] : 'issues.updated_on'
@enterprise_identifier = params[:enterprise_identifier]
@pm_project_id = params[:pm_project_id]
@pm_project_ids = params[:pm_project_ids]
@pm_sprint_id = params[:pm_sprint_id]
@@ -96,6 +97,7 @@ class Api::V1::Issues::ListService < ApplicationService
end
end

issues = issues.where(enterprise_identifier: enterprise_identifier) if enterprise_identifier.present?
#pm相关
# root_id# -1 查一级目录
issues = if root_id.to_i == -1


Loading…
Cancel
Save