Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_4.3

controllers/article.go

@@ -471,20 +471,13 @@ func (this *ArticleCommonController) Detail() {
 	}
 	resp := new(models.ArticleDetailResp)
 	detail, err := models.GetArticleDetailByIdMd5(articleIdMd5)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	if detail == nil {
-		resp.HasPermission = 2
-	} else {
-		resp.HasPermission = 1
-	}
-	if detail != nil {
-		detail.Body = html.UnescapeString(detail.Body)
-		detail.Abstract = html.UnescapeString(detail.Abstract)
-	}
+	detail.Body = html.UnescapeString(detail.Body)
+	//detail.Abstract = html.UnescapeString(detail.Abstract)
 	sellerList, err := models.GetSellerList(detail.ArticleId)
 	if err != nil {
 		br.Msg = "获取信息失败"