diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb index def9644d0..73f0b438e 100644 --- a/app/services/issues/list_query_service.rb +++ b/app/services/issues/list_query_service.rb @@ -27,9 +27,9 @@ class Issues::ListQueryService < ApplicationService issues = issues.joins(:pull_request).where(pull_requests: {status: 1}) end - # if search_name.present? - # issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%") - # end + if search_name.present? + issues = issues.where("issues.subject LIKE ? OR issues.description LIKE ? ", "%#{search_name}%", "%#{search_name}%") + end if start_time&.present? || end_time&.present? issues = issues.where("issues.start_date between ? and ?",start_time&.present? ? start_time.to_date : Time.now.to_date, end_time&.present? ? end_time.to_date : Time.now.to_date) diff --git a/app/views/users/_user_small.json.jbuilder b/app/views/users/_user_small.json.jbuilder index b8033ba77..f5929ef6b 100644 --- a/app/views/users/_user_small.json.jbuilder +++ b/app/views/users/_user_small.json.jbuilder @@ -1,9 +1,11 @@ -# 单表存储的信息可以放里面 -json.array! users do |user| - json.username user.full_name - json.login user.login - json.user_id user.id - json.image_url url_to_avatar(user) - json.profile_completed user.profile_completed -end - +# 单表存储的信息可以放里面 +json.array! users do |user| + json.username user.full_name + json.login user.login + json.user_id user.id + json.mail user.mail + json.custom_department user.custom_department + json.image_url url_to_avatar(user) + json.profile_completed user.profile_completed +end +