From 64fa3e12a5efd45fa7997d21551faeae89ce8459 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Jul 2025 10:50:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/dashboards_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/pm/dashboards_controller.rb b/app/controllers/api/pm/dashboards_controller.rb index afe03e01f..c45813f39 100644 --- a/app/controllers/api/pm/dashboards_controller.rb +++ b/app/controllers/api/pm/dashboards_controller.rb @@ -15,7 +15,8 @@ class Api::Pm::DashboardsController < Api::Pm::BaseController @issues = @issues.where(pm_project_id: pm_project_ids).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}) issues_1 = @issues.where(pm_issue_type: 1).where.not(status_id: [2,8]).to_sql issues_2 = @issues.where(pm_issue_type: [2,3]).where.not(status_id: [3,5,6]).to_sql - @issues = Issue.from("( #{issues_1} union #{issues_2}) as issues") + @issues = Issue.from("( #{issues_1} union #{issues_2}) as issues") + @issues = @issues.order(plan_end_date: :desc).order(created_on: :desc) @issues = kaminari_paginate(@issues.distinct.pm_includes) end