diff --git a/controller/report.go b/controller/report.go index 156382e..921bbd7 100644 --- a/controller/report.go +++ b/controller/report.go @@ -28,6 +28,10 @@ func ensureReportBelongs(c *gin.Context, result *response.Result, requestReportI result.NotFound(err.Error()) return false } + if requestReport == nil { + result.NotFound("指定报表未能找到。") + return false + } return ensureParkBelongs(c, result, requestReport.ParkId) } @@ -105,5 +109,9 @@ func fetchReportParkSummary(c *gin.Context) { result.NotFound(err.Error()) return } + if summary == nil { + result.NotFound("指定报表未能找到。") + return + } result.Json(http.StatusOK, "已经获取到指定报表中的园区概况。", gin.H{"summary": summary}) } diff --git a/service/report.go b/service/report.go index efcfbfc..4a133f9 100644 --- a/service/report.go +++ b/service/report.go @@ -137,10 +137,13 @@ func (_ReportService) InitializeNewReport(parkId string, period time.Time) (err func (_ReportService) RetreiveReportIndex(rid string) (*model.Report, error) { reports := make([]model.Report, 0) err := global.DBConn.Where(builder.Eq{"id": rid}).Find(&reports) + if err != nil { + return nil, err + } if len(reports) > 0 { return &reports[0], nil } else { - return nil, err + return nil, nil } }