From 4ef9b87b6205170575585b197f199ba10849830c Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 14:49:33 +0800
Subject: [PATCH 1/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

---
 .../src/main/java/com/epmet/service/impl/DraftServiceImpl.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/DraftServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
index d0632c34cb..aabea28dbb 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
@@ -140,7 +140,7 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
             draftAttrResultDTO.setCoverImg(coverImgDTO);
             draftAttrResultDTO.setGridIdList(gridIdList);
             if (StringUtils.isNoneBlank(draftAttrResultDTO.getTags())) {
-                String[] tagNames = draftAttrResultDTO.getTags().split("\\|");
+                String[] tagNames = draftAttrResultDTO.getTags().split("|");
                 draftAttrResultDTO.setTagNameList(tagNames);
             }
         } else {

From f29744b5d5f68871eac69f6f94dcf836ebb1ea9f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 10 Jun 2020 14:53:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerAgencyServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index fb9ea27ab0..23b07f5b93 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -680,6 +680,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         //当前机关信息
         returnDTO.setAgencyId(agencyEntity.getId());
         returnDTO.setAgencyName(agencyEntity.getOrganizationName());
+        returnDTO.setPid(agencyEntity.getPid());
+        returnDTO.setPids(agencyEntity.getPids());
+        returnDTO.setAllParentName(agencyEntity.getAllParentName());
         if (party) {
             //4.1:查询当前机关的网格列表以及所有下级机关的网格列表
             //当前机关下网格列表