From 9211ab2cf728aa5a1dc87cad2e3244443098099f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Sun, 7 Nov 2021 11:37:40 +0800 Subject: [PATCH] fix error --- app/controllers/announcement_feeds_controller.rb | 2 +- app/controllers/announcements_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/announcement_feeds_controller.rb b/app/controllers/announcement_feeds_controller.rb index 74d269a..fa2b0d9 100644 --- a/app/controllers/announcement_feeds_controller.rb +++ b/app/controllers/announcement_feeds_controller.rb @@ -7,7 +7,7 @@ class AnnouncementFeedsController < ApplicationController enddt = params[:end].blank? ? nil : params[:end] dt = params[:date].blank? ? nil : params[:date] feed_cache = BulletinFeedCache.where(uid: uid, start: startdt, end: enddt, date: dt) - feed_cache.where(:invalid_date.lte => Time.now).destroy + feed_cache.all_of({:invalid_date.ne=>nil,:invalid_date.lte => Time.now}).destroy count = feed_cache.count if count > 1 feed_cache.limit(count-1).destroy diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index a5e06ae..20c9734 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -465,7 +465,7 @@ class AnnouncementsController < ApplicationController widget_data_count = OrbitHelper.widget_data_count anns_cache = AnnsCache.where(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s) devide_flag = (!(defined? SiteFeed).nil?) - anns_cache.where(:invalid_date.ne=>nil).where(:invalid_date.lte => Time.now).destroy + anns_cache.all_of({:invalid_date.ne=>nil,:invalid_date.lte => Time.now}).destroy count = anns_cache.count if count > 1 anns_cache.limit(count-1).destroy