From b5b662036cc47941647b71a7a4f072beb35e998b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 11 Jun 2020 15:56:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?=
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, 3 insertions(+), 1 deletion(-)

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 f8fa5f43a7..f4d41ffa88 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
@@ -114,13 +114,15 @@
             apr.GRID_ID = #{gridId}
         </foreach>
             ) t
+            WHERE
+                1 = 1
         <if test="tagIdList !=null and tagIdList.size() > 0">
             <foreach collection="tagIdList" item="tagId"  separator=" ">
                 AND EXISTS(
                 SELECT 1
                 FROM ARTICLE_TAGS
                 WHERE DEL_FLAG = '0'
-                AND ARTICLE_ID = a.ID
+                AND ARTICLE_ID = t.articleId
                 AND TAG_ID=#{tagId}
                 )
             </foreach>

From 18be7456166849456d140a48900a8287a28a306e Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Thu, 11 Jun 2020 16:22:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/ArticleServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

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 79da360947..f2727b984c 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
@@ -881,6 +881,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			ArticleEntity article = ConvertUtils.sourceToTarget(draft,ArticleEntity.class);
 			article.setId(null);
 			article.setDraftId(draftId);
+			article.setStatusFlag(DraftConstant.PUBLISHED);
 			baseDao.insert(article);
 			if(null != draftContents && draftContents.size() > NumConstant.ZERO){
 				draftContents.forEach(content -> {