diff --git a/app/controllers/api/pm/weekly_issues_controller.rb b/app/controllers/api/pm/weekly_issues_controller.rb
index dac4d65d3..564333535 100644
--- a/app/controllers/api/pm/weekly_issues_controller.rb
+++ b/app/controllers/api/pm/weekly_issues_controller.rb
@@ -55,7 +55,15 @@ class Api::Pm::WeeklyIssuesController < Api::Pm::BaseController
   
   def group_issues
     @enterprise_identifier = params[:enterprise_identifier] || ''
-    @all_issues = Issue.where(enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
+    root_id = params[:root_id] || -1
+    @all_issues = Issue.none
+    if root_id.to_i == -1
+      @all_issues = Issue.where(root_id: nil, enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
+    elsif root_id.to_i.positive?
+      @all_issues = Issue.where(root_id: root_id, enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
+    else
+      @all_issues = Issue.where(enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
+    end
     @all_issues = @all_issues.where(pm_project_id: params[:pm_project_ids].split(",")) if params[:pm_project_ids].present?
     @all_issues = @all_issues.where(pm_issue_type: params[:pm_issue_type].to_i) if params[:pm_issue_type].present?
     @this_week_all_issues = @all_issues.where("due_date >= ? and start_date <= ?", Date.today.beginning_of_week.to_s, Date.today.end_of_week.to_s)
@@ -65,7 +73,13 @@ class Api::Pm::WeeklyIssuesController < Api::Pm::BaseController
   def personal_issues
     @enterprise_identifier = params[:enterprise_identifier] || ''
     return render_error('请输入正确的用户ID.') if params[:user_id].blank?
-    @all_issues = Issue.joins(:issue_participants).where(issue_participants: {participant_id: params[:user_id], participant_type: ['assigned']})
+    root_id = params[:root_id] || -1
+    @all_issues = Issue.none
+    if root_id.to_i == -1
+      @all_issues = Issue.joins(:issue_participants).where(root_id: nil, issue_participants: {participant_id: params[:user_id], participant_type: ['assigned']})
+    else 
+      @all_issues = Issue.joins(:issue_participants).where(root_id: root_id, issue_participants: {participant_id: params[:user_id], participant_type: ['assigned']})
+    end
     @all_issues = @all_issues.where(enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3]) 
     @this_week_all_issues = @all_issues.where("due_date >= ? and start_date <= ?", Date.today.beginning_of_week.to_s, Date.today.end_of_week.to_s).distinct
     @this_week_all_issues = @this_week_all_issues.order('created_on desc')
diff --git a/app/controllers/api/v1/projects/pipelines_controller.rb b/app/controllers/api/v1/projects/pipelines_controller.rb
index 6985e8b05..0f8ea7d52 100644
--- a/app/controllers/api/v1/projects/pipelines_controller.rb
+++ b/app/controllers/api/v1/projects/pipelines_controller.rb
@@ -148,7 +148,7 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController
         interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, del_content_params(sha).merge(identifier: @project.identifier))
         tip_exception(interactor.error) unless interactor.success?
       end
-      Gitea::ActionRun.where(repo_id: @pipeline.project.gpid).destroy_all
+      Gitea::ActionRun.where(repo_id: @pipeline.project.gpid, workflow_id: "#{@pipeline.pipeline_name}.yml").destroy_all
       @pipeline.destroy!
     end
     render_ok