From 7f585c045219781ddccfdf1acbefa43ca0388334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Mon, 19 Sep 2022 14:41:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(report):=E4=BF=AE=E6=AD=A3=E7=B2=BE?= =?UTF-8?q?=E7=AE=80=E7=BB=84=E8=A3=85=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/report.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/service/report.go b/service/report.go index 37a90b8..77370a2 100644 --- a/service/report.go +++ b/service/report.go @@ -602,19 +602,12 @@ func (_ReportService) AssembleReportPublicity(reportId string) (*model.Publicity var report = new(model.Report) err := global.DB.NewSelect().Model(report). Relation("Summary").Relation("WillDilutedFees").Relation("EndUsers"). - Relation("Park"). + Relation("Park").Relation("Park.Enterprise"). Where("r.id = ?", reportId). Scan(ctx) if err != nil { return nil, exceptions.NewNotFoundErrorFromError("未找到指定的公示报表", err) } - var enterprise = new(model.UserDetail) - err = global.DB.NewSelect().Model(enterprise). - Where("id = ?", report.Park.UserId). - Scan(ctx) - if err != nil { - return nil, exceptions.NewNotFoundErrorFromError("未找到指定公示报表对应的用户信息", err) - } // 组合数据 paidPart := model.PaidPart{ @@ -729,7 +722,7 @@ func (_ReportService) AssembleReportPublicity(reportId string) (*model.Publicity publicity := &model.Publicity{ Report: *report, Park: *report.Park, - User: *enterprise, + User: *report.Park.Enterprise, Paid: paidPart, EndUser: endUserSummary, Loss: lossPart,