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

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

@@ -362,11 +362,12 @@
         (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)
+        LEFT JOIN article_publish_range pr ON (pr.ARTICLE_ID = art.ID AND pr.DEL_FLAG = 0)
         WHERE
             art.DEL_FLAG = '0'
           AND art.STATUS_FLAG = 'published'
           AND ats.TAG_ID = #{tagId}
-          AND art.GRID_ID = #{gridId}
+          AND pr.GRID_ID = #{gridId}
         ORDER BY
             art.PUBLISH_DATE DESC,
             art.CREATED_TIME DESC
@@ -391,6 +392,7 @@
         <foreach collection="pidList" item="pid" separator=" , ">
             #{pid}
         </foreach>
+        ,ss.CREATED_TIME DESC
     </select>
     <select id="selectArticleListByTag" resultType="com.epmet.dto.result.ArticleListResultDTO">
         SELECT