From 9f8f7dfb2a2450660903a156210809b68fc3c8e3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 10 Jun 2020 15:33:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ArticleServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 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 70e42541b3..830360d1d5 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,7 +195,9 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			draftEntity.setCustomerId(tokenDto.getCustomerId());
 			draftEntity.setIsTop(DraftConstant.UN_TOP);
 			draftEntity.setStatusFlag(DraftConstant.UNPUBLISH);
-			draftEntity.setOrgId(loginUserDetails.getData().getAgencyId());
+			String orgIdPath = loginUserDetails.getData().getOrgIdPath();
+			String agencyId = orgIdPath.split(":")[orgIdPath.split(":").length - 1];
+			draftEntity.setOrgId(agencyId);
 			draftEntity.setOrgIdPath(loginUserDetails.getData().getOrgIdPath());
 			draftEntity.setGridId("");
 			draftEntity.setDepartmentId(loginUserDetails.getData().getCustomerId());

From 667bd4e30350e60f3164c4751a8a82d333f8a6ab Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 15:38:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=8E=A5=E5=8F=A3=20=20=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/DraftServiceImpl.java  | 6 +++---
 .../gov-voice-server/src/main/resources/mapper/DraftDao.xml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
index aabea28dbb..9c49d44023 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
@@ -139,8 +139,8 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
             List<String> gridIdList = baseDao.selectDraftGrids(formDTO.getDraftId());
             draftAttrResultDTO.setCoverImg(coverImgDTO);
             draftAttrResultDTO.setGridIdList(gridIdList);
-            if (StringUtils.isNoneBlank(draftAttrResultDTO.getTags())) {
-                String[] tagNames = draftAttrResultDTO.getTags().split("|");
+            if (StringUtils.isNotBlank(draftAttrResultDTO.getTags())) {
+                String[] tagNames = draftAttrResultDTO.getTags().split("\\|");
                 draftAttrResultDTO.setTagNameList(tagNames);
             }
         } else {
@@ -167,7 +167,7 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
             } else {
                 draftDetailResultDTO.setArticleContentList(new ArrayList<>());
             }
-            if (StringUtils.isNoneBlank(draftDetailResultDTO.getTags())) {
+            if (StringUtils.isNotBlank(draftDetailResultDTO.getTags())) {
                 String[] tagNames = draftDetailResultDTO.getTags().split("\\|");
                 draftDetailResultDTO.setTagNameList(tagNames);
             }else{
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
index ed813e8c6c..b13a0d3317 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
@@ -50,7 +50,8 @@
             PUBLISH_DATE,
             TITLE,
             PUBLISH_RANGE_DESC,
-            PUBLISHER_TYPE
+            PUBLISHER_TYPE,
+            TAGS
         FROM
             draft
         WHERE