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

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

@@ -359,13 +359,14 @@
             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} )
+        (art.ID = prange.ARTICLE_ID AND prange.DEL_FLAG = '0' AND prange.PUBLISH_STATUS = 'published')
         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'
           AND ats.TAG_ID = #{tagId}
+          AND prange.GRID_ID = #{gridId}
         ORDER BY
             art.PUBLISH_DATE DESC,
             art.CREATED_TIME DESC