Merge remote-tracking branch 'origin/dev_voice' into dev_voice

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

@@ -66,7 +66,7 @@
               FROM article_tags at
               WHERE at.DEL_FLAG = '0'
               AND at.ARTICLE_ID = a.ID
-              <foreach item="tagId" collection="tagIdList" open="AND (" separator="or" close=")" index="">
+              <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
                   at.TAG_ID = #{tagId}
               </foreach>
               )
@@ -124,7 +124,7 @@
             FROM article_tags at
             WHERE at.DEL_FLAG = '0'
             AND at.ARTICLE_ID = t.articleId
-            <foreach item="tagId" collection="tagIdList" open="AND (" separator="or" close=")" index="">
+            <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
                 at.TAG_ID = #{tagId}
             </foreach>
             )