floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2022-04-06 17:04:52 +08:00
parent 1f6ac05bad 7055974443
commit fde01e62ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/issues/list_query_service.rb
View File

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