From 61f28b9008d985724555e7337ea10334bc22182e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 24 Jun 2021 20:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8group=5Fconcat=20=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E5=8A=A0group=20by=20=E5=90=A6=E5=88=99=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8C=89=E7=85=A7=20concat=E5=AD=97=E6=AE=B5=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ArticleDao.xml     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 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 d039eb85d8..18ab511b2b 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
@@ -224,16 +224,14 @@
         art.DEL_FLAG = '0'
         AND
         art.STATUS_FLAG = 'published'
-        <if test="(tagName != null and tagName != '') or (excludeTagName != null and excludeTagName != '')">
-            GROUP BY art.ID
 
-             HAVING
-             <if test="tagName != null and tagName != ''">
-                 FIND_IN_SET(#{tagName},tags)
-             </if>
-             <if test="excludeTagName != null and excludeTagName != ''">
-               AND !FIND_IN_SET(#{excludeTagName},tags)
-             </if>
+        GROUP BY art.ID
+        HAVING
+        <if test="tagName != null and tagName != ''">
+            FIND_IN_SET(#{tagName},tags)
+        </if>
+        <if test="excludeTagName != null and excludeTagName != ''">
+            AND !FIND_IN_SET(#{excludeTagName},tags)
         </if>
         ORDER BY art.PUBLISH_DATE DESC , art.CREATED_TIME DESC
         LIMIT #{num}