From 5624c5a27c946b7626959e48e9544fe626a32125 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 15:11:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E9=A1=BF=E5=8F=B7=E9=9A=94=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 9d16988665..6644b12149 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
@@ -378,7 +378,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 		buildName(tokenDto,agencyGridNameList,publishRangeEntityList, fromDTO, articleGridResultDTO);
 		buildAgencyGridNames(tokenDto,agencyGridNameList,publishRangeEntityList, fromDTO, articleGridResultDTO);
-		draftEntity.setPublishRangeDesc(StringUtils.join(agencyGridNameList,"|"));
+		draftEntity.setPublishRangeDesc(StringUtils.join(agencyGridNameList,"、"));
 		return publishRangeEntityList;
 	}
 

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 2/3] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=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>
             )

From 679a157a7435e6996989f7b8d879015253b4c07a Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 15:15:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 6644b12149..4677634d03 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
@@ -177,7 +177,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		List<DraftContentEntity> draftContentList = null;
 		if (StringUtils.isNotBlank(fromDTO.getDraftId())) {
 			draftEntity = this.checkDraftStatus(fromDTO.getDraftId());
-			draftEntity.setTitle(StringUtils.isBlank(draftEntity.getTitle()) ? "" : draftEntity.getTitle());
+			draftEntity.setTitle(StringUtils.isBlank(fromDTO.getTitle()) ? "" : fromDTO.getTitle());
 			buildPreviewContent(fromDTO, draftEntity);
 			draftDao.updateById(draftEntity);
 		} else {