Trustie
/
forgeplus
forked from Gitlink/forgeplus
21
0
Fork 8
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'my_issues 增加按照创建时间倒序' (#389) from KingChan/forgeplus:standalone_develop into standalone_develop

This commit is contained in:
KingChan 2025-06-18 10:34:10 +08:00
parent e317fafb89 f767d95730
commit 63593535a7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/api/pm/dashboards_controller.rb
View File

@ -18,10 +18,9 @@ class Api::Pm::DashboardsController < Api::Pm::BaseController
return render_error('请输入正确的pm_issue_types.') if params[:pm_issue_types].blank?
pm_project_ids = params[:pm_project_ids].split(",") rescue []
pm_issue_types = params[:pm_issue_types].split(",") rescue []
@all_issues = Issue.where(pm_project_id: pm_project_ids, pm_issue_type: pm_issue_types)
@all_issues = Issue.where(pm_project_id: pm_project_ids, pm_issue_type: pm_issue_types).order(created_on: :desc)
@issues = @all_issues.joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'})
@issues = @issues.where.not(status_id: 5) if params[:category] == "opened"
@issues = kaminari_paginate(@issues.distinct.pm_includes)
@my_assign_requirements_count = @all_issues.where(pm_issue_type: 1).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}).size
@my_assign_tasks_count = @all_issues.where(pm_issue_type: 2).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}).size