From 61fe0f33861a256cdb46a0743474099985fe9aad Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 10 Jun 2020 15:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-voice-server/src/main/resources/mapper/ArticleDao.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
index 42ba89d7fc..933859cbae 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
+++ b/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>
             )