Merge branch 'cygx_12.2.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/article.go

@@ -90,7 +90,13 @@ func (this *ArticleController) Detail() {
 	detail.Body = strings.Replace(detail.Body, "pre", "div", -1)
 	detail.Abstract = html.UnescapeString(detail.Abstract)
 	//detail.Abstract, _ = services.GetReportContentTextSubNew(detail.Abstract)
-
+	//作者头像
+	if detail.DepartmentId > 0 {
+		departmentDetail, err := models.GetArticleDepartmentDateilById(detail.DepartmentId)
+		if err == nil {
+			detail.DepartmentImgUrl = departmentDetail.ImgUrl
+		}
+	}
 	lyjhTypeMap, _ := services.GetLyjhTypeMap()
 	if _, ok := lyjhTypeMap[detail.CategoryId]; ok {
 		detail.IsRoadShow = true
@@ -339,13 +345,7 @@ func (this *ArticleController) Detail() {
 			}
 		}
 		detail.SellerList = sellerList
-		//作者头像
-		if detail.DepartmentId > 0 {
-			departmentDetail, err := models.GetArticleDepartmentDateilById(detail.DepartmentId)
-			if err == nil {
-				detail.DepartmentImgUrl = departmentDetail.ImgUrl
-			}
-		}
+
 	} else { //潜在客户
 		if applyCount > 0 {
 			hasPermission = 5