Merge branch 'dev_voice' into dev

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:查询当前机关的网格列表以及所有下级机关的网格列表
             //当前机关下网格列表

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 {