Merge branch 'cygx_9.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/article.go

@@ -1950,7 +1950,7 @@ func GetReportLinkToArticleid(reportLink string) (articleId int, err error) {
 		}
 	}()
 	var artMd5 string
-	//处理报告的
+	//处理Md5的
 	strnum1 := strings.Index(reportLink, "id=")
 	if strnum1 > 0 {
 		sliceId := strings.Split(reportLink, "id=")
@@ -1969,6 +1969,22 @@ func GetReportLinkToArticleid(reportLink string) (articleId int, err error) {
 				articleId = detail.ArticleId
 			}
 		}
+	} else {
+		//处理活动的
+		linkList := strings.Split(reportLink, "/")
+		if linkList[len(linkList)-1] != "" {
+			linkArticleId, _ := strconv.Atoi(linkList[len(linkList)-1])
+			if linkArticleId > 0 {
+				articleInfo, errArt := models.GetArticleDetailById(linkArticleId)
+				if errArt != nil && errArt.Error() != utils.ErrNoRow() {
+					err = errArt
+					return
+				}
+				if articleInfo != nil {
+					articleId = articleInfo.ArticleId
+				}
+			}
+		}
 	}
 	return
 }