From f3457c9ab289d93495ca5a9720b6e2db8c192cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Thu, 22 Sep 2022 13:25:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(fee):=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/maintenance_fee.go | 2 +- service/maintenance_fee.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/controller/maintenance_fee.go b/controller/maintenance_fee.go index 8f2d5c5..7732b0a 100644 --- a/controller/maintenance_fee.go +++ b/controller/maintenance_fee.go @@ -197,7 +197,7 @@ func statAdditionalCharges(c *gin.Context) { result.Error(http.StatusInternalServerError, "不能解析给定的参数[page]。") return } - fees, total, err := service.MaintenanceFeeService.QueryAdditiionalCharges(requestUser, requestPark, period, keyword, requestPage) + fees, total, err := service.MaintenanceFeeService.QueryAdditionalCharges(requestUser, requestPark, period, keyword, requestPage) if err != nil { result.Error(http.StatusInternalServerError, err.Error()) return diff --git a/service/maintenance_fee.go b/service/maintenance_fee.go index 2247542..198bafd 100644 --- a/service/maintenance_fee.go +++ b/service/maintenance_fee.go @@ -175,7 +175,7 @@ type _FeeStat struct { Total decimal.Decimal } -func (f _MaintenanceFeeService) QueryAdditiionalCharges(uid, pid, period, keyword string, requestPage int) ([]model.AdditionalCharge, int64, error) { +func (f _MaintenanceFeeService) QueryAdditionalCharges(uid, pid, period, keyword string, requestPage int) ([]model.AdditionalCharge, int64, error) { var ( conditions = []string{fmt.Sprintf("%d", requestPage)} statFees = make([]_FeeStat, 0) @@ -250,14 +250,14 @@ func (f _MaintenanceFeeService) QueryAdditiionalCharges(uid, pid, period, keywor mapset.NewSet[string](), ) parks := make([]model.Park, 0) - err = global.DB.NewSelect().Model(&parks).Relation("Enterprise"). - Where("p.id in (?)", bun.In(parkIds.ToSlice())). - Scan(ctx) - if err != nil { - return make([]model.AdditionalCharge, 0), 0, fmt.Errorf("获取园区信息出现错误，%w", err) + if len(parkIds.ToSlice()) > 0 { + err = global.DB.NewSelect().Model(&parks).Relation("Enterprise"). + Where("p.id in (?)", bun.In(parkIds.ToSlice())). + Scan(ctx) + if err != nil { + return make([]model.AdditionalCharge, 0), 0, fmt.Errorf("获取园区信息出现错误，%w", err) + } } - f.l.Debug("Park ids", zap.Any("ids", parkIds)) - f.l.Debug("Check fees", zap.Any("fees", statFees)) assembledStat := lo.Reduce( statFees, func(acc []model.AdditionalCharge, elem _FeeStat, _ int) []model.AdditionalCharge {