Merge branch 'bug/7199' into debug

controllers/report_v2.go

@@ -694,7 +694,7 @@ func (this *ReportController) Detail() {
 			br.ErrMsg = "获取资源库版头失败, Err: " + err.Error()
 			return
 		}
-		if headResource.ResourceId > 0 {
+		if headResource != nil && headResource.ResourceId > 0 {
 			item.HeadImg = headResource.ImgUrl
 			item.HeadStyle = headResource.Style
 		}
@@ -707,7 +707,7 @@ func (this *ReportController) Detail() {
 			br.ErrMsg = "获取资源库版尾失败, Err: " + err.Error()
 			return
 		}
-		if endResource.ResourceId > 0 {
+		if endResource != nil && endResource.ResourceId > 0 {
 			item.EndImg = endResource.ImgUrl
 			item.EndStyle = endResource.Style
 		}

controllers/smart_report/smart_report.go

@@ -396,7 +396,7 @@ func (this *SmartReportController) Detail() {
 			br.ErrMsg = "获取资源库版尾失败, Err: " + err.Error()
 			return
 		}
-		if headResource.ResourceId > 0 {
+		if headResource != nil && headResource.ResourceId > 0 {
 			resp.HeadImg = headResource.ImgUrl
 			resp.HeadStyle = headResource.Style
 		}
@@ -409,7 +409,7 @@ func (this *SmartReportController) Detail() {
 			br.ErrMsg = "获取资源库版头失败, Err: " + err.Error()
 			return
 		}
-		if endResource.ResourceId > 0 {
+		if endResource != nil && endResource.ResourceId > 0 {
 			resp.EndImg = endResource.ImgUrl
 			resp.EndStyle = endResource.Style
 		}