From ef325aede5d5d8ffc08fceb0103e9decb152dc48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Tue, 13 Jun 2023 14:25:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(meter):=E4=BF=AE=E6=AD=A3=E8=A1=A8=E8=AE=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=A3=80=E7=B4=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repository/meter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/meter.go b/repository/meter.go index f59700d..9241ea7 100644 --- a/repository/meter.go +++ b/repository/meter.go @@ -1080,7 +1080,7 @@ func (mr _MeterRepository) ListLastMeterReading(pid string, date types.Date) ([] func (mr _MeterRepository) ListMeterDocForTemplate(pid string) ([]*model.SimpleMeterDocument, error) { mr.log.Info("列出指定园区中的表计与商户的关联详细记录", zap.String("park id", pid)) cacheConditions := []string{pid} - if docs, err := cache.RetrieveSearch[[]*model.SimpleMeterDocument]("simple_meter_doc", cacheConditions...); err == nil { + if docs, err := cache.RetrieveSearch[[]*model.SimpleMeterDocument]("simple_meter_doc", cacheConditions...); err == nil && docs != nil { mr.log.Info("从缓存中获取到了指定园区中的表计与商户的关联详细记录", zap.Int("count", len(*docs))) return *docs, nil } @@ -1110,7 +1110,7 @@ func (mr _MeterRepository) ListMeterDocForTemplate(pid string) ([]*model.SimpleM Where( goqu.I("m.park_id").Eq(pid), goqu.I("m.enabled").IsTrue(), - goqu.I("m.disassociated_at").IsNull(), + goqu.I("tm.disassociated_at").IsNull(), ). Order(goqu.I("m.seq").Asc()). Prepared(true).ToSQL()