Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

This commit is contained in:
xxq250 2023-04-10 15:44:23 +08:00
commit beca1b7928
1 changed files with 4 additions and 1 deletions

View File

@ -39,11 +39,14 @@ class ProjectsController < ApplicationController
category_id = params[:category_id]
@total_count =
if category_id.blank? && params[:search].blank?
if category_id.blank? && params[:search].blank? && params[:topic_id].blank?
# 默认查询时count性能问题处理
ProjectCategory.sum("projects_count") - Project.visible.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id").where("organization_extensions.visibility =2").count
elsif params[:search].present?
@projects.total_count
elsif params[:topic_id].present?
topic = ProjectTopic.find_by(id: params[:topic_id])
topic&.projects_count || 0
else
cate = ProjectCategory.find_by(id: category_id)
cate&.projects_count || 0