From e448433cedb5e5066d03060239f1d9f1e0252c99 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 28 Oct 2024 20:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/users/projects/list_service.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index 2e2716a21..dc406a955 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -55,13 +55,13 @@ class Api::V1::Users::Projects::ListService < ApplicationService projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct when 'watched' projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) - projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? when 'only_watched' projects = projects.where.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id}) - projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", start_at, end_at) if start_at.present? && end_at.present? + projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? when 'forked' if start_at.present? && end_at.present? - fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", start_at, end_at).select(:id, :fork_project_id).pluck(:fork_project_id) + fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", Time.at(start_at), Time.at(end_at)).select(:id, :fork_project_id).pluck(:fork_project_id) else fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id) end