|
|
|
@@ -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) |
|
|
|
|