From c94078831cb3520ab830161cd2655f25b48220f0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 17 Jan 2025 14:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E4=BB=8A=E6=97=A5=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E9=98=88=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/dashboards_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/pm/dashboards_controller.rb b/app/controllers/api/pm/dashboards_controller.rb index 0c483df46..8fd1f0b9e 100644 --- a/app/controllers/api/pm/dashboards_controller.rb +++ b/app/controllers/api/pm/dashboards_controller.rb @@ -7,7 +7,7 @@ class Api::Pm::DashboardsController < Api::Pm::BaseController return render_error('请输入正确的pm_project_ids.') if params[:pm_project_ids].blank? pm_project_ids = params[:pm_project_ids].split(",") rescue [] date = params[:date].present? ? params[:date].to_date : Date.today rescue Date.today - @issues = Issue.where("start_date < ? and due_date > ?", date, date) + @issues = Issue.where("start_date <= ? and due_date >= ?", date, date) @issues = @issues.where(pm_project_id: pm_project_ids).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}) @issues = kaminari_paginate(@issues.distinct.pm_includes) end