From 84895231dc0c8b116143f7893453bca2f510f467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Thu, 16 Nov 2023 15:08:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=AA=E5=85=B3=E8=81=94is?= =?UTF-8?q?sue=20=E5=92=8C=E8=AE=BE=E5=AE=9A=E7=BB=84=E7=BB=87=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=A9=BA=E9=97=B4=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/issues_controller.rb | 7 +++---- app/controllers/organizations/projects_controller.rb | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index 7d681ac55..ac1f3fce7 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -31,9 +31,10 @@ class Api::Pm::IssuesController < Api::Pm::BaseController not_join_id << @issue.id object_issues = Issue.where( pm_project_id: params[:pm_project_id], - root_id: nil, pm_issue_type: pm_issue_type ).where.not(id: not_join_id) + + object_issues = object_issues.where(root_id: nil, child_count: 0) if params[:issue_filter_type] == 'leaf_issue' @issues = kaminari_paginate(object_issues) render 'api/v1/issues/index' end @@ -121,9 +122,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController return render_error('请输入正确的ID数组！') unless params[:ids].is_a?(Array) params[:ids].each do |id| @issue = Issue.find_by(id: id, pm_project_id: params[:pm_project_id]) - if @issue.blank? - return render_not_found("ID为#{id}的疑修不存在!") - end + return render_not_found("ID为#{id}的疑修不存在!") if @issue.blank? end if params[:ids].blank? @issues = Issue.where(pm_project_id: params[:pm_project_id]) diff --git a/app/controllers/organizations/projects_controller.rb b/app/controllers/organizations/projects_controller.rb index ab5c9ef5d..9f40ff927 100644 --- a/app/controllers/organizations/projects_controller.rb +++ b/app/controllers/organizations/projects_controller.rb @@ -10,6 +10,7 @@ class Organizations::ProjectsController < Organizations::BaseController @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects") # 表情处理 keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('') + @projects = (@projects.where(id: params[:pm_project_repository_ids].split(',')) if params[:pm_project_repository_ids].present?) @projects = @projects.ransack(name_or_identifier_cont: keywords).result if params[:search].present? @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}") @projects = paginate(@projects)