Merge remote-tracking branch 'origin/dev_special_subject' into develop

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/SubjectArticleListResultDTO.java

@@ -44,4 +44,18 @@ public class SubjectArticleListResultDTO implements Serializable {
      */
     private String tagNames;
 
+    /**
+     * 文章封面
+     */
+    private String articleCoverImg;
+
+    public SubjectArticleListResultDTO() {
+        this.articleTitle = "";
+        this.articleContent = "";
+        this.articleId = "";
+        this.publisherName = "";
+        this.publishDate = "";
+        this.tagNames = "";
+        this.articleCoverImg = "";
+    }
 }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -355,11 +355,13 @@
             art.PUBLISHER_NAME AS publisherName,
             art.PUBLISH_DATE AS publishDate,
             IFNULL( art.PREVIEW_CONTENT, '' ) AS articleContent,
-            IFNULL( art.TAGS, '' ) AS tagNames
+            IFNULL( art.TAGS, '' ) AS tagNames,
+            IFNULL(ac.IMG_URL,'') AS articleCoverImg
         FROM ARTICLE art
         LEFT JOIN ARTICLE_PUBLISH_RANGE prange ON
         (art.ID = prange.ARTICLE_ID AND prange.DEL_FLAG = '0' AND prange.PUBLISH_STATUS = 'published' AND prange.GRID_ID = #{gridId} )
         LEFT JOIN article_tags ats ON (ats.ARTICLE_ID = art.ID)
+        LEFT JOIN article_cover ac ON (ac.ARTICLE_ID = art.ID AND ac.DEL_FLAG = 0)
         WHERE
             art.DEL_FLAG = '0'
           AND art.STATUS_FLAG = 'published'