From d3b552337e6331c67c5a6821f5f9cad2781f3cb4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 27 Mar 2024 16:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
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  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb
index d5bf01ad1..912305ca2 100644
--- a/app/controllers/api/pm/issues_controller.rb
+++ b/app/controllers/api/pm/issues_controller.rb
@@ -162,7 +162,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, :participantor_id
+      :status_ids, :ids, :exclude_ids, :pm_issue_types, :participator_id
     )
   end
 
diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb
index 01100fa07..b499a5ea5 100644
--- a/app/services/api/v1/issues/list_service.rb
+++ b/app/services/api/v1/issues/list_service.rb
@@ -5,7 +5,7 @@ class Api::V1::Issues::ListService < ApplicationService
   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 :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, :participantor
+  attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count, :complete_issues_count, :participator
 
   validates :category, inclusion: { in: %w[all opened closed], message: '请输入正确的Category'}
   validates :participant_category, inclusion: { in: %w[all aboutme authoredme assignedme atme], message: '请输入正确的ParticipantCategory'}
@@ -40,7 +40,7 @@ class Api::V1::Issues::ListService < ApplicationService
     @status_ids = params[:status_ids].present? ? params[:status_ids].split(',') : []
     @pm_issue_types = params[:pm_issue_types].present? ? params[:pm_issue_types].split(',') : []
     @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase
-    @participantor = params[:participantor_id].present? ? User.find_by_id(params[:participantor_id]) : current_user
+    @participator = params[:participator_id].present? ? User.find_by_id(params[:participator_id]) : current_user
     @current_user = current_user
   end
 
@@ -67,13 +67,13 @@ class Api::V1::Issues::ListService < ApplicationService
 
     case participant_category
     when 'aboutme' # 关于我的
-      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %w[authored assigned atme], participant_id: participantor&.id})
+      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %w[authored assigned atme], participant_id: participator&.id})
     when 'authoredme' # 我创建的
-      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'authored', participant_id: participantor&.id})
+      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'authored', participant_id: participator&.id})
     when 'assignedme' # 我负责的
-      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'assigned', participant_id: participantor&.id})
+      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'assigned', participant_id: participator&.id})
     when 'atme' # @我的
-      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'atme', participant_id: participantor&.id})
+      issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'atme', participant_id: participator&.id})
     end
     # author_id
     issues = issues.where(author_id: author_id) if author_id.present?