From fcbe9084cd2a6991786b78e3a8014968cf6afb59 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 10 Jun 2020 16:41:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ArticleServiceImpl.java      |  4 +--
 .../src/main/resources/mapper/ArticleDao.xml  | 36 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 5c6ea79c37..59a0a858ea 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -195,8 +195,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			draftEntity.setCustomerId(tokenDto.getCustomerId());
 			draftEntity.setIsTop(DraftConstant.UN_TOP);
 			draftEntity.setStatusFlag(DraftConstant.UNPUBLISH);
-			String orgIdPath = loginUserDetails.getData().getOrgIdPath();
-			String agencyId = orgIdPath.split(":")[orgIdPath.split(":").length - 1];
+			String[] orgIdPath = loginUserDetails.getData().getOrgIdPath().split(":");
+			String agencyId = orgIdPath[orgIdPath.length - 1];
 			draftEntity.setOrgId(agencyId);
 			draftEntity.setOrgIdPath(loginUserDetails.getData().getOrgIdPath());
 			draftEntity.setGridId("");
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 933859cbae..f8fa5f43a7 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
@@ -60,19 +60,16 @@
           AND a.STATUS_FLAG = 'published'
           AND a.CUSTOMER_ID = #{customerId}
           <if test="tagIdList !=null and tagIdList.size() > 0">
-              AND EXISTS (
-              SELECT DISTINCT
-              at.ARTICLE_ID
-              FROM article_tags at
-              WHERE at.DEL_FLAG = '0'
-              AND at.ARTICLE_ID = a.ID
-              <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
-                  at.TAG_ID = #{tagId}
+              <foreach collection="tagIdList" item="tagId"  separator=" ">
+                  AND EXISTS(
+                  SELECT 1
+                  FROM ARTICLE_TAGS
+                  WHERE DEL_FLAG = '0'
+                  AND ARTICLE_ID = a.ID
+                  AND TAG_ID=#{tagId}
+                  )
               </foreach>
-              )
           </if>
-
-
         ORDER BY PUBLISH_DATE DESC, UPDATED_TIME DESC
     </select>
     <select id="selectArticleListForGrid" resultType="com.epmet.dto.result.PublishedListResultDTO">
@@ -118,16 +115,15 @@
         </foreach>
             ) t
         <if test="tagIdList !=null and tagIdList.size() > 0">
-            AND EXISTS (
-            SELECT DISTINCT
-            at.ARTICLE_ID
-            FROM article_tags at
-            WHERE at.DEL_FLAG = '0'
-            AND at.ARTICLE_ID = t.articleId
-            <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
-                at.TAG_ID = #{tagId}
+            <foreach collection="tagIdList" item="tagId"  separator=" ">
+                AND EXISTS(
+                SELECT 1
+                FROM ARTICLE_TAGS
+                WHERE DEL_FLAG = '0'
+                AND ARTICLE_ID = a.ID
+                AND TAG_ID=#{tagId}
+                )
             </foreach>
-            )
         </if>
         ORDER BY publishDate DESC, UPDATED_TIME DESC
     </select>