diff --git a/app/controllers/api/pm/projects_controller.rb b/app/controllers/api/pm/projects_controller.rb index 1f05d02fb..063403501 100644 --- a/app/controllers/api/pm/projects_controller.rb +++ b/app/controllers/api/pm/projects_controller.rb @@ -11,12 +11,12 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController def issues_count return tip_exception '参数错误' unless params[:pm_project_id].present? - @issues = Issue.where(pm_project_id_params) + @issues = Issue.where(id: params[:pm_project_id]) data = {} @issues_count = @issues.group(:pm_project_id).count # requirement 1 task 2 bug 3 @issues_type_count = @issues.group(:pm_project_id, :pm_issue_type).count - pm_project_id_params[:pm_project_id].map(&:to_i).map do |project_id| + params[:pm_project_id].map(&:to_i).map do |project_id| data[project_id] = { total: @issues_count[project_id] || 0, requirement: @issues_type_count[[project_id, 1]] || 0, @@ -37,9 +37,5 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController @project = Project.joins(:owner).find params[:project_id] end - def pm_project_id_params - params.permit( - pm_project_id: [] - ) - end + end diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 8c6625ff1..0806a2397 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -81,7 +81,7 @@ class Api::V1::Issues::CreateService < ApplicationService end project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 - unless project.id.zero? + unless @project.id.zero? # 新增时向grimoirelab推送事件 IssueWebhookJob.set(wait: 5.seconds).perform_later(@created_issue.id) diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 4adbd26e4..a10c89bf6 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -88,7 +88,7 @@ class Api::V1::Issues::UpdateService < ApplicationService build_after_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 build_previous_issue_changes build_cirle_blockchain_token if blockchain_token_num.present? - unless project.id.zero? + unless @project.id.zero? # @信息发送 AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? # 消息发送