forked from Gitlink/forgeplus
更改:今日待办排序字段
This commit is contained in:
parent
c5fbebc678
commit
64fa3e12a5
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue