修复：时间nil处理

app/controllers/projects_controller.rb

@@ -287,19 +287,19 @@ class ProjectsController < ApplicationController
   end
 
   def watch_users
-    start_at = params[:start_at].to_i
+    start_at = params[:start_at]
-    end_at = params[:end_at].to_i
+    end_at = params[:end_at]
     watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct
-    watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
+    watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present?
     @watchers_count = watchers.size
     @watchers = paginate(watchers)
   end
 
   def praise_users
-    start_at = params[:start_at].to_i
+    start_at = params[:start_at]
-    end_at = params[:end_at].to_i
+    end_at = params[:end_at]
     praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct
-    praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
+    praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present?
     @praises_count = praises.size
     @praises = paginate(praises)
   end

app/controllers/watchers_controller.rb

@@ -5,10 +5,10 @@ class WatchersController < ApplicationController
   before_action :get_target
 
   def index
-    start_at = params[:start_at].to_i
+    start_at = params[:start_at]
-    end_at = params[:end_at].to_i
+    end_at = params[:end_at]
     scope = @target.watchers.includes(:user)
-    scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
+    scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present?
     @watchers = paginate(scope)
   end
 

app/services/api/v1/users/projects/list_service.rb

@@ -18,8 +18,8 @@ class Api::V1::Users::Projects::ListService < ApplicationService
     @sort_by = params[:sort_by] || 'updated_on'
     @sort_direction = params[:sort_direction] || 'desc'
     @search = params[:search]
-    @start_at = params[:start_at].to_i
+    @start_at = params[:start_at]
-    @end_at = params[:end_at].to_i
+    @end_at = params[:end_at]
     @current_user = current_user
   end
 
@@ -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 < ?", Time.at(start_at), Time.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.to_i), Time.at(end_at.to_i)) 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 < ?", Time.at(start_at), Time.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.to_i), Time.at(end_at.to_i)) 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 < ?", Time.at(start_at), Time.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.to_i), Time.at(end_at.to_i)).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