Merge remote-tracking branch 'remotes/origin/dev_voice' into dev

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());

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{

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