fixed 项目列表条件count增加标签名
This commit is contained in:
parent
05dd162646
commit
0559110d12
|
@ -43,11 +43,11 @@ class ProjectsController < ApplicationController
|
||||||
|
|
||||||
category_id = params[:category_id]
|
category_id = params[:category_id]
|
||||||
@total_count =
|
@total_count =
|
||||||
if category_id.blank? && params[:search].blank? && params[:topic_id].blank?
|
if category_id.blank? && params[:search].blank? && params[:topic_id].blank? && params[:topic_name].present?
|
||||||
# 默认查询时count性能问题处理
|
# 默认查询时count性能问题处理
|
||||||
not_category_count = Project.where(project_category_id: nil).count
|
not_category_count = Project.where(project_category_id: nil).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 + not_category_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 + not_category_count
|
||||||
elsif params[:search].present? || params[:topic_id].present?
|
elsif params[:search].present? || params[:topic_id].present? || params[:topic_name].present?
|
||||||
@projects.total_count
|
@projects.total_count
|
||||||
else
|
else
|
||||||
cate = ProjectCategory.find_by(id: category_id)
|
cate = ProjectCategory.find_by(id: category_id)
|
||||||
|
|
Loading…
Reference in New Issue